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

spi: bcm-qspi: Make bcm_qspi_remove() return void

The function bcm_qspi_remove() returns zero unconditionally. Make it
return void.

This is a preparation for making platform remove callbacks return void.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20221017200143.1426528-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Uwe Kleine-König and committed by
Mark Brown
666ea0ad e3b7fca3

+9 -6
+2 -3
drivers/spi/spi-bcm-qspi.c
··· 1682 1682 /* probe function to be called by SoC specific platform driver probe */ 1683 1683 EXPORT_SYMBOL_GPL(bcm_qspi_probe); 1684 1684 1685 - int bcm_qspi_remove(struct platform_device *pdev) 1685 + void bcm_qspi_remove(struct platform_device *pdev) 1686 1686 { 1687 1687 struct bcm_qspi *qspi = platform_get_drvdata(pdev); 1688 1688 ··· 1690 1690 bcm_qspi_hw_uninit(qspi); 1691 1691 clk_disable_unprepare(qspi->clk); 1692 1692 kfree(qspi->dev_ids); 1693 - 1694 - return 0; 1695 1693 } 1694 + 1696 1695 /* function to be called by SoC specific platform driver remove() */ 1697 1696 EXPORT_SYMBOL_GPL(bcm_qspi_remove); 1698 1697
+1 -1
drivers/spi/spi-bcm-qspi.h
··· 96 96 /* The common driver functions to be called by the SoC platform driver */ 97 97 int bcm_qspi_probe(struct platform_device *pdev, 98 98 struct bcm_qspi_soc_intc *soc_intc); 99 - int bcm_qspi_remove(struct platform_device *pdev); 99 + void bcm_qspi_remove(struct platform_device *pdev); 100 100 101 101 /* pm_ops used by the SoC platform driver called on PM suspend/resume */ 102 102 extern const struct dev_pm_ops bcm_qspi_pm_ops;
+3 -1
drivers/spi/spi-brcmstb-qspi.c
··· 23 23 24 24 static int brcmstb_qspi_remove(struct platform_device *pdev) 25 25 { 26 - return bcm_qspi_remove(pdev); 26 + bcm_qspi_remove(pdev); 27 + 28 + return 0; 27 29 } 28 30 29 31 static struct platform_driver brcmstb_qspi_driver = {
+3 -1
drivers/spi/spi-iproc-qspi.c
··· 129 129 130 130 static int bcm_iproc_remove(struct platform_device *pdev) 131 131 { 132 - return bcm_qspi_remove(pdev); 132 + bcm_qspi_remove(pdev); 133 + 134 + return 0; 133 135 } 134 136 135 137 static const struct of_device_id bcm_iproc_of_match[] = {