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

spi: Remove the use of dev_err_probe() 

Merge series from Xichao Zhao <zhao.xichao@vivo.com>:

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.
This commit is contained in:
Mark Brown 2025-08-19 18:45:38 +01:00
parent c1dd310f1d 27848c082b
commit b875b97017
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
8 changed files with 9 additions and 13 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 */ /* Allocate storage for host and driver private data */
host = devm_spi_alloc_host(dev, sizeof(struct amd_spi)); host = devm_spi_alloc_host(dev, sizeof(struct amd_spi));
if (!host) if (!host)
return dev_err_probe(dev, -ENOMEM, "Error allocating SPI host\n"); return -ENOMEM;
amd_spi = spi_controller_get_devdata(host); 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); amd_spi->io_remap_addr = devm_ioremap(dev, io_base_addr, AMD_HID2_MEM_SIZE);
if (!amd_spi->io_remap_addr) if (!amd_spi->io_remap_addr)
return dev_err_probe(dev, -ENOMEM, return -ENOMEM;
"ioremap of SPI registers failed\n");
dev_dbg(dev, "io_remap_address: %p\n", amd_spi->io_remap_addr); 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 */ /* Allocate storage for host and driver private data */
host = devm_spi_alloc_host(dev, sizeof(struct amd_spi)); host = devm_spi_alloc_host(dev, sizeof(struct amd_spi));
if (!host) if (!host)
return dev_err_probe(dev, -ENOMEM, "Error allocating SPI host\n"); return -ENOMEM;
amd_spi = spi_controller_get_devdata(host); amd_spi = spi_controller_get_devdata(host);
amd_spi->io_remap_addr = devm_platform_ioremap_resource(pdev, 0); amd_spi->io_remap_addr = devm_platform_ioremap_resource(pdev, 0);

2
drivers/spi/spi-amlogic-spisg.c
View File

@ -733,7 +733,7 @@ static int aml_spisg_probe(struct platform_device *pdev)
else else
ctlr = spi_alloc_host(dev, sizeof(*spisg)); ctlr = spi_alloc_host(dev, sizeof(*spisg));
if (!ctlr) if (!ctlr)
return dev_err_probe(dev, -ENOMEM, "controller allocation failed\n"); return -ENOMEM;
spisg = spi_controller_get_devdata(ctlr); spisg = spi_controller_get_devdata(ctlr);
spisg->controller = ctlr; spisg->controller = ctlr;

3
drivers/spi/spi-microchip-core-qspi.c
View File

@ -701,8 +701,7 @@ static int mchp_coreqspi_probe(struct platform_device *pdev)
ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*qspi)); ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*qspi));
if (!ctlr) if (!ctlr)
return dev_err_probe(&pdev->dev, -ENOMEM, return -ENOMEM;
"unable to allocate host for QSPI controller\n");
qspi = spi_controller_get_devdata(ctlr); qspi = spi_controller_get_devdata(ctlr);
platform_set_drvdata(pdev, qspi); platform_set_drvdata(pdev, qspi);

3
drivers/spi/spi-microchip-core.c
View File

@ -534,8 +534,7 @@ static int mchp_corespi_probe(struct platform_device *pdev)
host = devm_spi_alloc_host(&pdev->dev, sizeof(*spi)); host = devm_spi_alloc_host(&pdev->dev, sizeof(*spi));
if (!host) if (!host)
return dev_err_probe(&pdev->dev, -ENOMEM, return -ENOMEM;
"unable to allocate host for SPI controller\n");
platform_set_drvdata(pdev, host); platform_set_drvdata(pdev, host);

2
drivers/spi/spi-mt65xx.c
View File

@ -1159,7 +1159,7 @@ static int mtk_spi_probe(struct platform_device *pdev)
host = devm_spi_alloc_host(dev, sizeof(*mdata)); host = devm_spi_alloc_host(dev, sizeof(*mdata));
if (!host) if (!host)
return dev_err_probe(dev, -ENOMEM, "failed to alloc spi host\n"); return -ENOMEM;
host->auto_runtime_pm = true; host->auto_runtime_pm = true;
host->dev.of_node = dev->of_node; host->dev.of_node = dev->of_node;

2
drivers/spi/spi-pxa2xx.c
View File

@ -1283,7 +1283,7 @@ int pxa2xx_spi_probe(struct device *dev, struct ssp_device *ssp,
else else
controller = devm_spi_alloc_host(dev, sizeof(*drv_data)); controller = devm_spi_alloc_host(dev, sizeof(*drv_data));
if (!controller) if (!controller)
return dev_err_probe(dev, -ENOMEM, "cannot alloc spi_controller\n"); return -ENOMEM;
drv_data = spi_controller_get_devdata(controller); drv_data = spi_controller_get_devdata(controller);
drv_data->controller = controller; drv_data->controller = controller;

3
drivers/spi/spi-s3c64xx.c
View File

@ -1268,8 +1268,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
host = devm_spi_alloc_host(&pdev->dev, sizeof(*sdd)); host = devm_spi_alloc_host(&pdev->dev, sizeof(*sdd));
if (!host) if (!host)
return dev_err_probe(&pdev->dev, -ENOMEM, return -ENOMEM;
"Unable to allocate SPI Host\n");
platform_set_drvdata(pdev, host); platform_set_drvdata(pdev, host);