Commit 982fe2e0 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Ulf Hansson
Browse files

mmc: dw_mmc: Make dw_mci_pltfm_remove() return void 



dw_mci_pltfm_remove() returned zero unconditionally. Make it return void
instead which makes its semantics a bit clearer.

Convert the drivers that use this function as .remove() callback to
.remove_new() which has the right prototype. This helps getting rid of
the platform_driver's remove callback that returns an int (which is
error prone). The other users didn't check the return value anyhow.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230505221506.1247424-1-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2fba941d

drivers/mmc/host/dw_mmc-bluefield.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static int dw_mci_bluefield_probe(struct platform_device *pdev) 


static struct platform_driver dw_mci_bluefield_pltfm_driver = {

	.probe		= dw_mci_bluefield_probe,

	.remove		= dw_mci_pltfm_remove,

	.remove_new	= dw_mci_pltfm_remove,

	.driver		= {

		.name		= "dwmmc_bluefield",

		.probe_type	= PROBE_PREFER_ASYNCHRONOUS,

drivers/mmc/host/dw_mmc-k3.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static const struct dev_pm_ops dw_mci_k3_dev_pm_ops = { 


static struct platform_driver dw_mci_k3_pltfm_driver = {

	.probe		= dw_mci_k3_probe,

	.remove		= dw_mci_pltfm_remove,

	.remove_new	= dw_mci_pltfm_remove,

	.driver		= {

		.name		= "dwmmc_k3",

		.probe_type	= PROBE_PREFER_ASYNCHRONOUS,

drivers/mmc/host/dw_mmc-pltfm.c

+2 −3
Original line number Diff line number Diff line
@@ -121,18 +121,17 @@ static int dw_mci_pltfm_probe(struct platform_device *pdev) 
	return dw_mci_pltfm_register(pdev, drv_data);

}



int dw_mci_pltfm_remove(struct platform_device *pdev)

void dw_mci_pltfm_remove(struct platform_device *pdev)

{

	struct dw_mci *host = platform_get_drvdata(pdev);



	dw_mci_remove(host);

	return 0;

}

EXPORT_SYMBOL_GPL(dw_mci_pltfm_remove);



static struct platform_driver dw_mci_pltfm_driver = {

	.probe		= dw_mci_pltfm_probe,

	.remove		= dw_mci_pltfm_remove,

	.remove_new	= dw_mci_pltfm_remove,

	.driver		= {

		.name		= "dw_mmc",

		.probe_type	= PROBE_PREFER_ASYNCHRONOUS,

drivers/mmc/host/dw_mmc-pltfm.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


extern int dw_mci_pltfm_register(struct platform_device *pdev,

				const struct dw_mci_drv_data *drv_data);

extern int dw_mci_pltfm_remove(struct platform_device *pdev);

extern void dw_mci_pltfm_remove(struct platform_device *pdev);

extern const struct dev_pm_ops dw_mci_pltfm_pmops;



#endif /* _DW_MMC_PLTFM_H_ */

drivers/mmc/host/dw_mmc-starfive.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int dw_mci_starfive_probe(struct platform_device *pdev) 


static struct platform_driver dw_mci_starfive_driver = {

	.probe = dw_mci_starfive_probe,

	.remove = dw_mci_pltfm_remove,

	.remove_new = dw_mci_pltfm_remove,

	.driver = {

		.name = "dwmmc_starfive",

		.probe_type = PROBE_PREFER_ASYNCHRONOUS,