tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Mark Brown b875b970 c1dd310f

+9 -13
+2 -3
drivers/spi/spi-amd-pci.c
··· 38 38 /* Allocate storage for host and driver private data */ 39 39 host = devm_spi_alloc_host(dev, sizeof(struct amd_spi)); 40 40 if (!host) 41 - return dev_err_probe(dev, -ENOMEM, "Error allocating SPI host\n"); 41 + return -ENOMEM; 42 42 43 43 amd_spi = spi_controller_get_devdata(host); 44 44 ··· 47 47 amd_spi->io_remap_addr = devm_ioremap(dev, io_base_addr, AMD_HID2_MEM_SIZE); 48 48 49 49 if (!amd_spi->io_remap_addr) 50 - return dev_err_probe(dev, -ENOMEM, 51 - "ioremap of SPI registers failed\n"); 50 + return -ENOMEM; 52 51 53 52 dev_dbg(dev, "io_remap_address: %p\n", amd_spi->io_remap_addr); 54 53
+1 -1
drivers/spi/spi-amd.c
··· 857 857 /* Allocate storage for host and driver private data */ 858 858 host = devm_spi_alloc_host(dev, sizeof(struct amd_spi)); 859 859 if (!host) 860 - return dev_err_probe(dev, -ENOMEM, "Error allocating SPI host\n"); 860 + return -ENOMEM; 861 861 862 862 amd_spi = spi_controller_get_devdata(host); 863 863 amd_spi->io_remap_addr = devm_platform_ioremap_resource(pdev, 0);
+1 -1
drivers/spi/spi-amlogic-spisg.c
··· 733 733 else 734 734 ctlr = spi_alloc_host(dev, sizeof(*spisg)); 735 735 if (!ctlr) 736 - return dev_err_probe(dev, -ENOMEM, "controller allocation failed\n"); 736 + return -ENOMEM; 737 737 738 738 spisg = spi_controller_get_devdata(ctlr); 739 739 spisg->controller = ctlr;
+1 -2
drivers/spi/spi-microchip-core-qspi.c
··· 701 701 702 702 ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(*qspi)); 703 703 if (!ctlr) 704 - return dev_err_probe(&pdev->dev, -ENOMEM, 705 - "unable to allocate host for QSPI controller\n"); 704 + return -ENOMEM; 706 705 707 706 qspi = spi_controller_get_devdata(ctlr); 708 707 platform_set_drvdata(pdev, qspi);
+1 -2
drivers/spi/spi-microchip-core.c
··· 534 534 535 535 host = devm_spi_alloc_host(&pdev->dev, sizeof(*spi)); 536 536 if (!host) 537 - return dev_err_probe(&pdev->dev, -ENOMEM, 538 - "unable to allocate host for SPI controller\n"); 537 + return -ENOMEM; 539 538 540 539 platform_set_drvdata(pdev, host); 541 540
+1 -1
drivers/spi/spi-mt65xx.c
··· 1159 1159 1160 1160 host = devm_spi_alloc_host(dev, sizeof(*mdata)); 1161 1161 if (!host) 1162 - return dev_err_probe(dev, -ENOMEM, "failed to alloc spi host\n"); 1162 + return -ENOMEM; 1163 1163 1164 1164 host->auto_runtime_pm = true; 1165 1165 host->dev.of_node = dev->of_node;
+1 -1
drivers/spi/spi-pxa2xx.c
··· 1283 1283 else 1284 1284 controller = devm_spi_alloc_host(dev, sizeof(*drv_data)); 1285 1285 if (!controller) 1286 - return dev_err_probe(dev, -ENOMEM, "cannot alloc spi_controller\n"); 1286 + return -ENOMEM; 1287 1287 1288 1288 drv_data = spi_controller_get_devdata(controller); 1289 1289 drv_data->controller = controller;
+1 -2
drivers/spi/spi-s3c64xx.c
··· 1268 1268 1269 1269 host = devm_spi_alloc_host(&pdev->dev, sizeof(*sdd)); 1270 1270 if (!host) 1271 - return dev_err_probe(&pdev->dev, -ENOMEM, 1272 - "Unable to allocate SPI Host\n"); 1271 + return -ENOMEM; 1273 1272 1274 1273 platform_set_drvdata(pdev, host); 1275 1274