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

mmc: Switch back to struct platform_driver::remove() 



After commit 0edb555a ("platform: Make platform_driver::remove()
return void") .remove() is (again) the right callback to implement for
platform drivers.

Convert all platform drivers below drivers/mmc to use .remove(), with
the eventual goal to drop struct platform_driver::remove_new(). As
.remove() and .remove_new() have the same prototypes, conversion is done
by just changing the structure member name in the driver initializer.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://lore.kernel.org/r/20240927145832.754697-2-u.kleine-koenig@baylibre.com


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

drivers/mmc/core/pwrseq_emmc.c

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ MODULE_DEVICE_TABLE(of, mmc_pwrseq_emmc_of_match); 


static struct platform_driver mmc_pwrseq_emmc_driver = {

	.probe = mmc_pwrseq_emmc_probe,

	.remove_new = mmc_pwrseq_emmc_remove,

	.remove = mmc_pwrseq_emmc_remove,

	.driver = {

		.name = "pwrseq_emmc",

		.of_match_table = mmc_pwrseq_emmc_of_match,

drivers/mmc/core/pwrseq_sd8787.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void mmc_pwrseq_sd8787_remove(struct platform_device *pdev) 


static struct platform_driver mmc_pwrseq_sd8787_driver = {

	.probe = mmc_pwrseq_sd8787_probe,

	.remove_new = mmc_pwrseq_sd8787_remove,

	.remove = mmc_pwrseq_sd8787_remove,

	.driver = {

		.name = "pwrseq_sd8787",

		.of_match_table = mmc_pwrseq_sd8787_of_match,

drivers/mmc/core/pwrseq_simple.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static void mmc_pwrseq_simple_remove(struct platform_device *pdev) 


static struct platform_driver mmc_pwrseq_simple_driver = {

	.probe = mmc_pwrseq_simple_probe,

	.remove_new = mmc_pwrseq_simple_remove,

	.remove = mmc_pwrseq_simple_remove,

	.driver = {

		.name = "pwrseq_simple",

		.of_match_table = mmc_pwrseq_simple_of_match,

drivers/mmc/host/alcor.c

+1 −1
Original line number Diff line number Diff line
@@ -1175,7 +1175,7 @@ MODULE_DEVICE_TABLE(platform, alcor_pci_sdmmc_ids); 


static struct platform_driver alcor_pci_sdmmc_driver = {

	.probe		= alcor_pci_sdmmc_drv_probe,

	.remove_new	= alcor_pci_sdmmc_drv_remove,

	.remove		= alcor_pci_sdmmc_drv_remove,

	.id_table	= alcor_pci_sdmmc_ids,

	.driver		= {

		.name	= DRV_NAME_ALCOR_PCI_SDMMC,

drivers/mmc/host/atmel-mci.c

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


static struct platform_driver atmci_driver = {

	.probe		= atmci_probe,

	.remove_new	= atmci_remove,

	.remove		= atmci_remove,

	.driver		= {

		.name		= "atmel_mci",

		.probe_type	= PROBE_PREFER_ASYNCHRONOUS,