Commit 666ea0ad authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20221017200143.1426528-1-u.kleine-koenig@pengutronix.deSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent e3b7fca3
...@@ -1682,7 +1682,7 @@ int bcm_qspi_probe(struct platform_device *pdev, ...@@ -1682,7 +1682,7 @@ int bcm_qspi_probe(struct platform_device *pdev,
/* probe function to be called by SoC specific platform driver probe */ /* probe function to be called by SoC specific platform driver probe */
EXPORT_SYMBOL_GPL(bcm_qspi_probe); EXPORT_SYMBOL_GPL(bcm_qspi_probe);
int bcm_qspi_remove(struct platform_device *pdev) void bcm_qspi_remove(struct platform_device *pdev)
{ {
struct bcm_qspi *qspi = platform_get_drvdata(pdev); struct bcm_qspi *qspi = platform_get_drvdata(pdev);
...@@ -1690,9 +1690,8 @@ int bcm_qspi_remove(struct platform_device *pdev) ...@@ -1690,9 +1690,8 @@ int bcm_qspi_remove(struct platform_device *pdev)
bcm_qspi_hw_uninit(qspi); bcm_qspi_hw_uninit(qspi);
clk_disable_unprepare(qspi->clk); clk_disable_unprepare(qspi->clk);
kfree(qspi->dev_ids); kfree(qspi->dev_ids);
return 0;
} }
/* function to be called by SoC specific platform driver remove() */ /* function to be called by SoC specific platform driver remove() */
EXPORT_SYMBOL_GPL(bcm_qspi_remove); EXPORT_SYMBOL_GPL(bcm_qspi_remove);
......
...@@ -96,7 +96,7 @@ static inline u32 get_qspi_mask(int type) ...@@ -96,7 +96,7 @@ static inline u32 get_qspi_mask(int type)
/* The common driver functions to be called by the SoC platform driver */ /* The common driver functions to be called by the SoC platform driver */
int bcm_qspi_probe(struct platform_device *pdev, int bcm_qspi_probe(struct platform_device *pdev,
struct bcm_qspi_soc_intc *soc_intc); struct bcm_qspi_soc_intc *soc_intc);
int bcm_qspi_remove(struct platform_device *pdev); void bcm_qspi_remove(struct platform_device *pdev);
/* pm_ops used by the SoC platform driver called on PM suspend/resume */ /* pm_ops used by the SoC platform driver called on PM suspend/resume */
extern const struct dev_pm_ops bcm_qspi_pm_ops; extern const struct dev_pm_ops bcm_qspi_pm_ops;
......
...@@ -23,7 +23,9 @@ static int brcmstb_qspi_probe(struct platform_device *pdev) ...@@ -23,7 +23,9 @@ static int brcmstb_qspi_probe(struct platform_device *pdev)
static int brcmstb_qspi_remove(struct platform_device *pdev) static int brcmstb_qspi_remove(struct platform_device *pdev)
{ {
return bcm_qspi_remove(pdev); bcm_qspi_remove(pdev);
return 0;
} }
static struct platform_driver brcmstb_qspi_driver = { static struct platform_driver brcmstb_qspi_driver = {
......
...@@ -129,7 +129,9 @@ static int bcm_iproc_probe(struct platform_device *pdev) ...@@ -129,7 +129,9 @@ static int bcm_iproc_probe(struct platform_device *pdev)
static int bcm_iproc_remove(struct platform_device *pdev) static int bcm_iproc_remove(struct platform_device *pdev)
{ {
return bcm_qspi_remove(pdev); bcm_qspi_remove(pdev);
return 0;
} }
static const struct of_device_id bcm_iproc_of_match[] = { static const struct of_device_id bcm_iproc_of_match[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment