superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spi: spi_amd: Remove the use of dev_err_probe() 

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>
pull/1354/merge
Xichao Zhao 2025-08-19 17:20:38 +08:00 committed by Mark Brown
parent c17b750b3a
commit 2a5d410916
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/spi/spi-amd-pci.c
View 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);

2
drivers/spi/spi-amd.c
View 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);