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

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

Convert all platform drivers below drivers/ata/ 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.

While touching these files, make indention of the struct initializer
consistent in several files.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20241016141609.27329-2-u.kleine-koenig@baylibre.com
Signed-off-by: Niklas Cassel <cassel@kernel.org>

diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
index 2f16524c252629cf89014144b33fec85d6bca137..ef569eae4ce4625e92c24c7dd54e8704b9aff2c4 100644 (file)
--- a/drivers/ata/ahci_brcm.c
+++ b/drivers/ata/ahci_brcm.c
@@ -571,7 +571,7 @@ static SIMPLE_DEV_PM_OPS(ahci_brcm_pm_ops, brcm_ahci_suspend, brcm_ahci_resume);
 
 static struct platform_driver brcm_ahci_driver = {
        .probe = brcm_ahci_probe,
-       .remove_new = brcm_ahci_remove,
+       .remove = brcm_ahci_remove,
        .shutdown = brcm_ahci_shutdown,
        .driver = {
                .name = DRV_NAME,

diff --git a/drivers/ata/ahci_ceva.c b/drivers/ata/ahci_ceva.c
index 11a2c199a7c24628e858f2fc8e88e69a60c8b94b..1ec35778903ddc28aebdab7d72676a31e757e56f 100644 (file)
--- a/drivers/ata/ahci_ceva.c
+++ b/drivers/ata/ahci_ceva.c
@@ -402,7 +402,7 @@ MODULE_DEVICE_TABLE(of, ceva_ahci_of_match);
 
 static struct platform_driver ceva_ahci_driver = {
        .probe = ceva_ahci_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .driver = {
                .name = DRV_NAME,
                .of_match_table = ceva_ahci_of_match,

diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c
index 55a6627d5450e7b6625cfa29e50138489b2c6f05..ca0924dc5bd26ba424b26bd040bf83720c96b56f 100644 (file)
--- a/drivers/ata/ahci_da850.c
+++ b/drivers/ata/ahci_da850.c
@@ -238,7 +238,7 @@ MODULE_DEVICE_TABLE(of, ahci_da850_of_match);
 
 static struct platform_driver ahci_da850_driver = {
        .probe = ahci_da850_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .driver = {
                .name = DRV_NAME,
                .of_match_table = ahci_da850_of_match,

diff --git a/drivers/ata/ahci_dm816.c b/drivers/ata/ahci_dm816.c
index 4cb70064fb9944e06ca108208d597cc27a6a7e4d..b08547b877a1f77ba220e925de321ed034147d7b 100644 (file)
--- a/drivers/ata/ahci_dm816.c
+++ b/drivers/ata/ahci_dm816.c
@@ -182,7 +182,7 @@ MODULE_DEVICE_TABLE(of, ahci_dm816_of_match);
 
 static struct platform_driver ahci_dm816_driver = {
        .probe = ahci_dm816_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .driver = {
                .name = AHCI_DM816_DRV_NAME,
                .of_match_table = ahci_dm816_of_match,

diff --git a/drivers/ata/ahci_dwc.c b/drivers/ata/ahci_dwc.c
index ed263de3fd7067dfcb75c694de75692ff1ab79a5..aec6d793f51a9cc464d7d907e1d6b86d237f6e2f 100644 (file)
--- a/drivers/ata/ahci_dwc.c
+++ b/drivers/ata/ahci_dwc.c
@@ -478,7 +478,7 @@ MODULE_DEVICE_TABLE(of, ahci_dwc_of_match);
 
 static struct platform_driver ahci_dwc_driver = {
        .probe = ahci_dwc_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .shutdown = ahci_platform_shutdown,
        .driver = {
                .name = DRV_NAME,

diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c
index 357aba1d5929ffd073a33a7f39f31529b78a3bd5..f01f08048f97aa230877e413ba6e416d79779c1b 100644 (file)
--- a/drivers/ata/ahci_imx.c
+++ b/drivers/ata/ahci_imx.c
@@ -1027,7 +1027,7 @@ static SIMPLE_DEV_PM_OPS(ahci_imx_pm_ops, imx_ahci_suspend, imx_ahci_resume);
 
 static struct platform_driver imx_ahci_driver = {
        .probe = imx_ahci_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .driver = {
                .name = DRV_NAME,
                .of_match_table = imx_ahci_of_match,

diff --git a/drivers/ata/ahci_mtk.c b/drivers/ata/ahci_mtk.c
index adc851cd55789c9b99ce6461ecb1af78c817e346..7295b9066ae213a72a8c180a66ecfac8c2f46ff9 100644 (file)
--- a/drivers/ata/ahci_mtk.c
+++ b/drivers/ata/ahci_mtk.c
@@ -174,7 +174,7 @@ MODULE_DEVICE_TABLE(of, ahci_of_match);
 
 static struct platform_driver mtk_ahci_driver = {
        .probe = mtk_ahci_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .driver = {
                .name = DRV_NAME,
                .of_match_table = ahci_of_match,

diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
index f3187351e8a6c2daef3438dc3008ecac92692b48..8744dae41612fc35155bd87dcf8cb2983ac930b9 100644 (file)
--- a/drivers/ata/ahci_mvebu.c
+++ b/drivers/ata/ahci_mvebu.c
@@ -245,7 +245,7 @@ MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match);
 
 static struct platform_driver ahci_mvebu_driver = {
        .probe = ahci_mvebu_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .suspend = ahci_mvebu_suspend,
        .resume = ahci_mvebu_resume,
        .driver = {

diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index 81fc63f6b00816171e4626afa2f22584c4c11365..c18054333f7c968cc4e131545fc3127f03ac27e4 100644 (file)
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -96,7 +96,7 @@ MODULE_DEVICE_TABLE(acpi, ahci_acpi_match);
 
 static struct platform_driver ahci_driver = {
        .probe = ahci_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .shutdown = ahci_platform_shutdown,
        .driver = {
                .name = DRV_NAME,

diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c
index b1a4e57578e203f1b8db661782e49b8f1e71fba8..30e39885b64edf9cbb1eeca853659582f5296361 100644 (file)
--- a/drivers/ata/ahci_qoriq.c
+++ b/drivers/ata/ahci_qoriq.c
@@ -357,7 +357,7 @@ static SIMPLE_DEV_PM_OPS(ahci_qoriq_pm_ops, ahci_platform_suspend,
 
 static struct platform_driver ahci_qoriq_driver = {
        .probe = ahci_qoriq_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .driver = {
                .name = DRV_NAME,
                .of_match_table = ahci_qoriq_of_match,

diff --git a/drivers/ata/ahci_seattle.c b/drivers/ata/ahci_seattle.c
index 59f97aa7ac75c29a1c1973e9b4d93c806c354ea9..3f16c167840222e0de935f7fe44b3d83b95bc16c 100644 (file)
--- a/drivers/ata/ahci_seattle.c
+++ b/drivers/ata/ahci_seattle.c
@@ -185,7 +185,7 @@ MODULE_DEVICE_TABLE(acpi, ahci_acpi_match);
 
 static struct platform_driver ahci_seattle_driver = {
        .probe = ahci_seattle_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .driver = {
                .name = DRV_NAME,
                .acpi_match_table = ahci_acpi_match,

diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index 79a8b0aa37bf37fa8eb44e2dcba7181dfb2222b0..6b9b4a1dfa15bb6f395cc742f25251376b869a21 100644 (file)
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -238,7 +238,7 @@ static struct platform_driver st_ahci_driver = {
                .of_match_table = st_ahci_match,
        },
        .probe = st_ahci_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
 };
 module_platform_driver(st_ahci_driver);
 

diff --git a/drivers/ata/ahci_sunxi.c b/drivers/ata/ahci_sunxi.c
index 58b2683954ddf765e377bf124407d71d14caa4f6..5d4584570ae013a4e44ca69557cc2c5aa61d32b1 100644 (file)
--- a/drivers/ata/ahci_sunxi.c
+++ b/drivers/ata/ahci_sunxi.c
@@ -292,7 +292,7 @@ MODULE_DEVICE_TABLE(of, ahci_sunxi_of_match);
 
 static struct platform_driver ahci_sunxi_driver = {
        .probe = ahci_sunxi_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .driver = {
                .name = DRV_NAME,
                .of_match_table = ahci_sunxi_of_match,

diff --git a/drivers/ata/ahci_tegra.c b/drivers/ata/ahci_tegra.c
index 8703c2a4658bb9b777459629e06545f1f369cb9d..44584eed637442da2897c552e7e7566ab91b1072 100644 (file)
--- a/drivers/ata/ahci_tegra.c
+++ b/drivers/ata/ahci_tegra.c
@@ -608,7 +608,7 @@ deinit_controller:
 
 static struct platform_driver tegra_ahci_driver = {
        .probe = tegra_ahci_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .driver = {
                .name = DRV_NAME,
                .of_match_table = tegra_ahci_of_match,

diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c
index 7e6b4db8a1c27635081ea2a861468d7eadb8b412..dfbd8c53abcbd4d38f847c446ce0e7609e7ce408 100644 (file)
--- a/drivers/ata/ahci_xgene.c
+++ b/drivers/ata/ahci_xgene.c
@@ -859,7 +859,7 @@ disable_resources:
 
 static struct platform_driver xgene_ahci_driver = {
        .probe = xgene_ahci_probe,
-       .remove_new = ata_platform_remove_one,
+       .remove = ata_platform_remove_one,
        .driver = {
                .name = DRV_NAME,
                .of_match_table = xgene_ahci_of_match,

diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index d0c6924d25b67fbd2f3976fb1a928741a74bed87..514d549286b56eabe07dfc2b3a961ef0f7c983f2 100644 (file)
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -964,7 +964,7 @@ MODULE_DEVICE_TABLE(of, arasan_cf_id_table);
 
 static struct platform_driver arasan_cf_driver = {
        .probe          = arasan_cf_probe,
-       .remove_new     = arasan_cf_remove,
+       .remove         = arasan_cf_remove,
        .driver         = {
                .name   = DRIVER_NAME,
                .pm     = &arasan_cf_pm_ops,

diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
index f3f5b2b0ecc9f1dc54f9361fa35375c95d9f0693..e8cda988feb503482b4a9d868b3178b5ef981731 100644 (file)
--- a/drivers/ata/pata_ep93xx.c
+++ b/drivers/ata/pata_ep93xx.c
@@ -1015,7 +1015,7 @@ static struct platform_driver ep93xx_pata_platform_driver = {
                .of_match_table = ep93xx_pata_of_ids,
        },
        .probe = ep93xx_pata_probe,
-       .remove_new = ep93xx_pata_remove,
+       .remove = ep93xx_pata_remove,
 };
 
 module_platform_driver(ep93xx_pata_platform_driver);

diff --git a/drivers/ata/pata_falcon.c b/drivers/ata/pata_falcon.c
index 18ceefd176df0fe1bb426080b5c16644afec2fd1..334c4eea41ec0ac092f5df58863a097231b56b03 100644 (file)
--- a/drivers/ata/pata_falcon.c
+++ b/drivers/ata/pata_falcon.c
@@ -225,8 +225,8 @@ static void pata_falcon_remove_one(struct platform_device *pdev)
 
 static struct platform_driver pata_falcon_driver = {
        .probe = pata_falcon_init_one,
-       .remove_new = pata_falcon_remove_one,
-       .driver   = {
+       .remove = pata_falcon_remove_one,
+       .driver = {
                .name   = "atari-falcon-ide",
        },
 };

diff --git a/drivers/ata/pata_ftide010.c b/drivers/ata/pata_ftide010.c
index 73a9a5109238b31647286689f604d3a8c1c61dde..c3a8384c3e04d4ef39018e26d7766a7f8962f239 100644 (file)
--- a/drivers/ata/pata_ftide010.c
+++ b/drivers/ata/pata_ftide010.c
@@ -557,7 +557,7 @@ static struct platform_driver pata_ftide010_driver = {
                .of_match_table = pata_ftide010_of_match,
        },
        .probe = pata_ftide010_probe,
-       .remove_new = pata_ftide010_remove,
+       .remove = pata_ftide010_remove,
 };
 module_platform_driver(pata_ftide010_driver);
 

diff --git a/drivers/ata/pata_gayle.c b/drivers/ata/pata_gayle.c
index 94df60ac230782b6ea038f65548c1e29cac37edb..8602c388994863210fae144523df0ec7f5701372 100644 (file)
--- a/drivers/ata/pata_gayle.c
+++ b/drivers/ata/pata_gayle.c
@@ -202,9 +202,9 @@ static void pata_gayle_remove_one(struct platform_device *pdev)
 
 static struct platform_driver pata_gayle_driver = {
        .probe = pata_gayle_init_one,
-       .remove_new = pata_gayle_remove_one,
-       .driver   = {
-               .name   = "amiga-gayle-ide",
+       .remove = pata_gayle_remove_one,
+       .driver = {
+               .name = "amiga-gayle-ide",
        },
 };
 

diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c
index d0aa8fc929b4508b5d6d3f6a9e93f87e5e9fe72d..b37682b0578f48ea9d51a103d19e40fe91c4729f 100644 (file)
--- a/drivers/ata/pata_imx.c
+++ b/drivers/ata/pata_imx.c
@@ -249,7 +249,7 @@ MODULE_DEVICE_TABLE(of, imx_pata_dt_ids);
 
 static struct platform_driver pata_imx_driver = {
        .probe          = pata_imx_probe,
-       .remove_new     = pata_imx_remove,
+       .remove         = pata_imx_remove,
        .driver = {
                .name           = DRV_NAME,
                .of_match_table = imx_pata_dt_ids,

diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index 8a9ee828478f01907b7246911491beb808a8507f..80f6a91acf6f50d1bcb44be4106c38d5093c1984 100644 (file)
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -298,7 +298,7 @@ static struct platform_driver ixp4xx_pata_platform_driver = {
                .of_match_table = ixp4xx_pata_of_match,
        },
        .probe          = ixp4xx_pata_probe,
-       .remove_new     = ata_platform_remove_one,
+       .remove         = ata_platform_remove_one,
 };
 
 module_platform_driver(ixp4xx_pata_platform_driver);

diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 3f92586779156a9583bbfc87057e1ca716ce7c79..210a63283f62befd1eb3a9678e3d4478bb9fe731 100644 (file)
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -854,7 +854,7 @@ static const struct of_device_id mpc52xx_ata_of_match[] = {
 
 static struct platform_driver mpc52xx_ata_of_platform_driver = {
        .probe          = mpc52xx_ata_probe,
-       .remove_new     = mpc52xx_ata_remove,
+       .remove         = mpc52xx_ata_remove,
 #ifdef CONFIG_PM_SLEEP
        .suspend        = mpc52xx_ata_suspend,
        .resume         = mpc52xx_ata_resume,

diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index 4956f0f5b93fad69b500b4da91d5d0be78a33366..178b28eff170a97f3c1190f432b8e54a465ecafb 100644 (file)
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -89,7 +89,7 @@ static struct platform_driver pata_of_platform_driver = {
                .of_match_table = pata_of_platform_match,
        },
        .probe          = pata_of_platform_probe,
-       .remove_new     = ata_platform_remove_one,
+       .remove         = ata_platform_remove_one,
 };
 
 module_platform_driver(pata_of_platform_driver);

diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 232c3dad7ee88acbfaa8a0ef4afb8ef399c85e8c..87479bc893b252622d5f5b4a0761a09a3adb6d93 100644 (file)
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -223,7 +223,7 @@ static int pata_platform_probe(struct platform_device *pdev)
 
 static struct platform_driver pata_platform_driver = {
        .probe          = pata_platform_probe,
-       .remove_new     = ata_platform_remove_one,
+       .remove         = ata_platform_remove_one,
        .driver = {
                .name           = DRV_NAME,
        },

diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c
index 538bd3423d859d91863f83f7a2beb87b68ae6888..434f380114af09cc6b78f101d2b0a918b6726452 100644 (file)
--- a/drivers/ata/pata_pxa.c
+++ b/drivers/ata/pata_pxa.c
@@ -306,7 +306,7 @@ static void pxa_ata_remove(struct platform_device *pdev)
 
 static struct platform_driver pxa_ata_driver = {
        .probe          = pxa_ata_probe,
-       .remove_new     = pxa_ata_remove,
+       .remove         = pxa_ata_remove,
        .driver         = {
                .name           = DRV_NAME,
        },

diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index 0fa253ad7c93e682f60c410d75b3ad9124364492..fd81e75c9402375a6e465dd7b1b7739799dc2c5c 100644 (file)
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -164,7 +164,7 @@ static void rb532_pata_driver_remove(struct platform_device *pdev)
 
 static struct platform_driver rb532_pata_platform_driver = {
        .probe          = rb532_pata_driver_probe,
-       .remove_new     = rb532_pata_driver_remove,
+       .remove         = rb532_pata_driver_remove,
        .driver  = {
                .name   = DRV_NAME,
        },

diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index 52f5168e4db542ad6626da8dd6ba00cc8833eada..6e1dd0d9c035290bb4ce4f56f92355678981c47d 100644 (file)
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -1240,7 +1240,7 @@ static struct platform_driver sata_dwc_driver = {
                .of_match_table = sata_dwc_match,
        },
        .probe = sata_dwc_probe,
-       .remove_new = sata_dwc_remove,
+       .remove = sata_dwc_remove,
 };
 
 module_platform_driver(sata_dwc_driver);

diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 01aa05f4c3f5cd1c43cd03643da4a04d8facce20..87e91a937a44a1542b16050d534c9793a80e9d10 100644 (file)
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -1589,7 +1589,7 @@ static struct platform_driver fsl_sata_driver = {
                .of_match_table = fsl_sata_match,
        },
        .probe          = sata_fsl_probe,
-       .remove_new     = sata_fsl_remove,
+       .remove         = sata_fsl_remove,
 #ifdef CONFIG_PM_SLEEP
        .suspend        = sata_fsl_suspend,
        .resume         = sata_fsl_resume,

diff --git a/drivers/ata/sata_gemini.c b/drivers/ata/sata_gemini.c
index f574e3c3f5b48f5321fc1ff0d13181222ebee6cf..d040799bf9cb7185582588b69f2f4a86d2901b98 100644 (file)
--- a/drivers/ata/sata_gemini.c
+++ b/drivers/ata/sata_gemini.c
@@ -425,7 +425,7 @@ static struct platform_driver gemini_sata_driver = {
                .of_match_table = gemini_sata_of_match,
        },
        .probe = gemini_sata_probe,
-       .remove_new = gemini_sata_remove,
+       .remove = gemini_sata_remove,
 };
 module_platform_driver(gemini_sata_driver);
 

diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c
index 63ef7bb073ce03362b9290d32d07fe5392385c19..b1b40e9551deda1b02f902ff065e64843559eea0 100644 (file)
--- a/drivers/ata/sata_highbank.c
+++ b/drivers/ata/sata_highbank.c
@@ -614,12 +614,12 @@ static SIMPLE_DEV_PM_OPS(ahci_highbank_pm_ops,
                  ahci_highbank_suspend, ahci_highbank_resume);
 
 static struct platform_driver ahci_highbank_driver = {
-       .remove_new = ata_platform_remove_one,
-        .driver = {
-                .name = "highbank-ahci",
-                .of_match_table = ahci_of_match,
-                .pm = &ahci_highbank_pm_ops,
-        },
+       .remove = ata_platform_remove_one,
+       .driver = {
+               .name = "highbank-ahci",
+               .of_match_table = ahci_of_match,
+               .pm = &ahci_highbank_pm_ops,
+       },
        .probe = ahci_highbank_probe,
 };
 

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 05c905827dc5c6f9a77490b4497e7c8a6a32bbe9..b8f363370e1aa46dfe45e40971f2e800143dec07 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4255,7 +4255,7 @@ MODULE_DEVICE_TABLE(of, mv_sata_dt_ids);
 
 static struct platform_driver mv_platform_driver = {
        .probe          = mv_platform_probe,
-       .remove_new     = mv_platform_remove,
+       .remove         = mv_platform_remove,
        .suspend        = mv_platform_suspend,
        .resume         = mv_platform_resume,
        .driver         = {

diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
index c1469d0768801943d6a27679b06286a33c124aab..22820a02d7408033d698a98373e1e8e7ef47f908 100644 (file)
--- a/drivers/ata/sata_rcar.c
+++ b/drivers/ata/sata_rcar.c
@@ -1009,7 +1009,7 @@ static const struct dev_pm_ops sata_rcar_pm_ops = {
 
 static struct platform_driver sata_rcar_driver = {
        .probe          = sata_rcar_probe,
-       .remove_new     = sata_rcar_remove,
+       .remove         = sata_rcar_remove,
        .driver = {
                .name           = DRV_NAME,
                .of_match_table = sata_rcar_match,