]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: spi_amd: Remove the use of dev_err_probe()
authorXichao Zhao <zhao.xichao@vivo.com>
Tue, 19 Aug 2025 09:20:38 +0000 (17:20 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 19 Aug 2025 12:05:58 +0000 (13:05 +0100)
The dev_err_probe() doesn't do anything when error is '-ENOMEM'. Therefore,
remove the useless call to dev_err_probe(), and just return the value instead.

Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
Link: https://patch.msgid.link/20250819092044.549464-2-zhao.xichao@vivo.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-amd-pci.c
drivers/spi/spi-amd.c

index e5faab414c172653562f5f7bec96109a26e0f567..d48c3a5da303d92065d90914db690c7847ef8a5e 100644 (file)
@@ -38,7 +38,7 @@ static int amd_spi_pci_probe(struct pci_dev *pdev,
        /* Allocate storage for host and driver private data */
        host = devm_spi_alloc_host(dev, sizeof(struct amd_spi));
        if (!host)
-               return dev_err_probe(dev, -ENOMEM, "Error allocating SPI host\n");
+               return -ENOMEM;
 
        amd_spi = spi_controller_get_devdata(host);
 
@@ -47,8 +47,7 @@ static int amd_spi_pci_probe(struct pci_dev *pdev,
        amd_spi->io_remap_addr = devm_ioremap(dev, io_base_addr, AMD_HID2_MEM_SIZE);
 
        if (!amd_spi->io_remap_addr)
-               return dev_err_probe(dev, -ENOMEM,
-                               "ioremap of SPI registers failed\n");
+               return -ENOMEM;
 
        dev_dbg(dev, "io_remap_address: %p\n", amd_spi->io_remap_addr);
 
index 02e7fe095a0b5520f9a1842987fa034629ef0c98..4d1dce4f497406b17a8ea1f09f9040789e6795c0 100644 (file)
@@ -857,7 +857,7 @@ static int amd_spi_probe(struct platform_device *pdev)
        /* Allocate storage for host and driver private data */
        host = devm_spi_alloc_host(dev, sizeof(struct amd_spi));
        if (!host)
-               return dev_err_probe(dev, -ENOMEM, "Error allocating SPI host\n");
+               return -ENOMEM;
 
        amd_spi = spi_controller_get_devdata(host);
        amd_spi->io_remap_addr = devm_platform_ioremap_resource(pdev, 0);