power: 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/power/ 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>
Link: https://lore.kernel.org/r/20241010203622.839625-6-u.kleine-koenig@baylibre.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/reset/at91-poweroff.c b/drivers/power/reset/at91-poweroff.c
index 93eece0278652207b5fdfd597268f7ef1beaf867..7bc779055cf3f788b8961c66b1cfd53d4a9749b9 100644 (file)
--- a/drivers/power/reset/at91-poweroff.c
+++ b/drivers/power/reset/at91-poweroff.c
@@ -223,7 +223,7 @@ MODULE_DEVICE_TABLE(of, at91_poweroff_of_match);
 
 static struct platform_driver at91_poweroff_driver = {
        .probe = at91_poweroff_probe,
-       .remove_new = at91_poweroff_remove,
+       .remove = at91_poweroff_remove,
        .driver = {
                .name = "at91-poweroff",
                .of_match_table = at91_poweroff_of_match,

diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
index 16512654295f5c4007860d01859f42154177ec70..036b18a1f90f807ae95b7081cd0d30f284b744c8 100644 (file)
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -427,7 +427,7 @@ static void at91_reset_remove(struct platform_device *pdev)
 
 static struct platform_driver at91_reset_driver = {
        .probe = at91_reset_probe,
-       .remove_new = at91_reset_remove,
+       .remove = at91_reset_remove,
        .driver = {
                .name = "at91-reset",
                .of_match_table = at91_reset_of_match,

diff --git a/drivers/power/reset/at91-sama5d2_shdwc.c b/drivers/power/reset/at91-sama5d2_shdwc.c
index 959ce0dbe91d112d006176bd36165cf208e4f810..edb0df86aff45e053d6f35b5df076fab793dd856 100644 (file)
--- a/drivers/power/reset/at91-sama5d2_shdwc.c
+++ b/drivers/power/reset/at91-sama5d2_shdwc.c
@@ -441,7 +441,7 @@ static void at91_shdwc_remove(struct platform_device *pdev)
 
 static struct platform_driver at91_shdwc_driver = {
        .probe = at91_shdwc_probe,
-       .remove_new = at91_shdwc_remove,
+       .remove = at91_shdwc_remove,
        .driver = {
                .name = "at91-shdwc",
                .of_match_table = at91_shdwc_of_match,

diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c
index fa25fbd5393433930845cc42de6bd91ea7cb8b81..1a6fc8d38e20678fc5ac16384ef83b9766aa6237 100644 (file)
--- a/drivers/power/reset/ltc2952-poweroff.c
+++ b/drivers/power/reset/ltc2952-poweroff.c
@@ -305,7 +305,7 @@ MODULE_DEVICE_TABLE(of, of_ltc2952_poweroff_match);
 
 static struct platform_driver ltc2952_poweroff_driver = {
        .probe = ltc2952_poweroff_probe,
-       .remove_new = ltc2952_poweroff_remove,
+       .remove = ltc2952_poweroff_remove,
        .driver = {
                .name = "ltc2952-poweroff",
                .of_match_table = of_ltc2952_poweroff_match,

diff --git a/drivers/power/reset/qnap-poweroff.c b/drivers/power/reset/qnap-poweroff.c
index e0f2ff6b147c19a932d600513f652b42df1b03fd..f7d8fc935d5199dd39179f33e37fb1c7e1a906ce 100644 (file)
--- a/drivers/power/reset/qnap-poweroff.c
+++ b/drivers/power/reset/qnap-poweroff.c
@@ -118,7 +118,7 @@ static void qnap_power_off_remove(struct platform_device *pdev)
 
 static struct platform_driver qnap_power_off_driver = {
        .probe  = qnap_power_off_probe,
-       .remove_new = qnap_power_off_remove,
+       .remove = qnap_power_off_remove,
        .driver = {
                .name   = "qnap_power_off",
                .of_match_table = of_match_ptr(qnap_power_off_of_match_table),

diff --git a/drivers/power/supply/ab8500_btemp.c b/drivers/power/supply/ab8500_btemp.c
index 87c9b8e744b319595c8a8f83296d711b27871063..37039e28fc4bd27844e36ee69e700fed24d5ee8d 100644 (file)
--- a/drivers/power/supply/ab8500_btemp.c
+++ b/drivers/power/supply/ab8500_btemp.c
@@ -818,7 +818,7 @@ MODULE_DEVICE_TABLE(of, ab8500_btemp_match);
 
 struct platform_driver ab8500_btemp_driver = {
        .probe = ab8500_btemp_probe,
-       .remove_new = ab8500_btemp_remove,
+       .remove = ab8500_btemp_remove,
        .driver = {
                .name = "ab8500-btemp",
                .of_match_table = ab8500_btemp_match,

diff --git a/drivers/power/supply/ab8500_chargalg.c b/drivers/power/supply/ab8500_chargalg.c
index 854491ad3ecd5f5e6a8224bca0c7b15f58b6d9fe..14e1b448bd39b286404f31509dbe006d16390877 100644 (file)
--- a/drivers/power/supply/ab8500_chargalg.c
+++ b/drivers/power/supply/ab8500_chargalg.c
@@ -1837,7 +1837,7 @@ static const struct of_device_id ab8500_chargalg_match[] = {
 
 struct platform_driver ab8500_chargalg_driver = {
        .probe = ab8500_chargalg_probe,
-       .remove_new = ab8500_chargalg_remove,
+       .remove = ab8500_chargalg_remove,
        .driver = {
                .name = "ab8500_chargalg",
                .of_match_table = ab8500_chargalg_match,

diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c
index 93181ebfb324737305e5cc0d3965112120db2e1b..cece8d6753ac14f8970c13ce6b2d91e678733574 100644 (file)
--- a/drivers/power/supply/ab8500_charger.c
+++ b/drivers/power/supply/ab8500_charger.c
@@ -3711,7 +3711,7 @@ MODULE_DEVICE_TABLE(of, ab8500_charger_match);
 
 static struct platform_driver ab8500_charger_driver = {
        .probe = ab8500_charger_probe,
-       .remove_new = ab8500_charger_remove,
+       .remove = ab8500_charger_remove,
        .driver = {
                .name = "ab8500-charger",
                .of_match_table = ab8500_charger_match,

diff --git a/drivers/power/supply/ab8500_fg.c b/drivers/power/supply/ab8500_fg.c
index a71903b1bf781ea57ef973db61d778aa2e8a584c..78871a2143de34c7e1a81882ab7105fbf19387ec 100644 (file)
--- a/drivers/power/supply/ab8500_fg.c
+++ b/drivers/power/supply/ab8500_fg.c
@@ -3242,7 +3242,7 @@ MODULE_DEVICE_TABLE(of, ab8500_fg_match);
 
 struct platform_driver ab8500_fg_driver = {
        .probe = ab8500_fg_probe,
-       .remove_new = ab8500_fg_remove,
+       .remove = ab8500_fg_remove,
        .driver = {
                .name = "ab8500-fg",
                .of_match_table = ab8500_fg_match,

diff --git a/drivers/power/supply/acer_a500_battery.c b/drivers/power/supply/acer_a500_battery.c
index 58e7b2eac68f9745f5a2c48ba27951f65e681d2f..39d85b11a13c2350876da22ee5c427479d161351 100644 (file)
--- a/drivers/power/supply/acer_a500_battery.c
+++ b/drivers/power/supply/acer_a500_battery.c
@@ -286,7 +286,7 @@ static struct platform_driver a500_battery_driver = {
                .pm = &a500_battery_pm_ops,
        },
        .probe = a500_battery_probe,
-       .remove_new = a500_battery_remove,
+       .remove = a500_battery_remove,
 };
 module_platform_driver(a500_battery_driver);
 

diff --git a/drivers/power/supply/act8945a_charger.c b/drivers/power/supply/act8945a_charger.c
index 51122bfbf196c9779b267dadeabe0aaab1a9c087..b2b82f97a471204e458bcdf85f68280638451a08 100644 (file)
--- a/drivers/power/supply/act8945a_charger.c
+++ b/drivers/power/supply/act8945a_charger.c
@@ -651,7 +651,7 @@ static struct platform_driver act8945a_charger_driver = {
                .name = "act8945a-charger",
        },
        .probe  = act8945a_charger_probe,
-       .remove_new = act8945a_charger_remove,
+       .remove = act8945a_charger_remove,
 };
 module_platform_driver(act8945a_charger_driver);
 

diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index 858e2b77ee5b00017a7ef334a998ea79d42fdce7..9a1ba051e62fba629cebc0f0c2f711770fc84f7f 100644 (file)
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -1740,7 +1740,7 @@ static struct platform_driver charger_manager_driver = {
                .of_match_table = charger_manager_match,
        },
        .probe = charger_manager_probe,
-       .remove_new = charger_manager_remove,
+       .remove = charger_manager_remove,
        .id_table = charger_manager_id,
 };
 

diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
index 30ec76cdf34b0bad6946e5f9cd02435f9e0c16fd..813037c00ded567e6acdff4f202b7c8d6de80dfd 100644 (file)
--- a/drivers/power/supply/cpcap-battery.c
+++ b/drivers/power/supply/cpcap-battery.c
@@ -1169,7 +1169,7 @@ static struct platform_driver cpcap_battery_driver = {
                .of_match_table = of_match_ptr(cpcap_battery_id_table),
        },
        .probe  = cpcap_battery_probe,
-       .remove_new = cpcap_battery_remove,
+       .remove = cpcap_battery_remove,
 };
 module_platform_driver(cpcap_battery_driver);
 

diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c
index 91e7292d86bb77b7c618e52c20e8f49e1aaf7f07..7781b45a67a7d2d7d60597033ebbf7d256e98cc4 100644 (file)
--- a/drivers/power/supply/cpcap-charger.c
+++ b/drivers/power/supply/cpcap-charger.c
@@ -969,7 +969,7 @@ static struct platform_driver cpcap_charger_driver = {
                .of_match_table = cpcap_charger_id_table,
        },
        .shutdown = cpcap_charger_shutdown,
-       .remove_new = cpcap_charger_remove,
+       .remove = cpcap_charger_remove,
 };
 module_platform_driver(cpcap_charger_driver);
 

diff --git a/drivers/power/supply/da9030_battery.c b/drivers/power/supply/da9030_battery.c
index b89604a8c0199f9854d5ebc35249494953d84345..34328f5d556e21233c3a0d201ae23e211d7c5016 100644 (file)
--- a/drivers/power/supply/da9030_battery.c
+++ b/drivers/power/supply/da9030_battery.c
@@ -571,7 +571,7 @@ static struct platform_driver da903x_battery_driver = {
                .name   = "da903x-battery",
        },
        .probe = da9030_battery_probe,
-       .remove_new = da9030_battery_remove,
+       .remove = da9030_battery_remove,
 };
 
 module_platform_driver(da903x_battery_driver);

diff --git a/drivers/power/supply/da9052-battery.c b/drivers/power/supply/da9052-battery.c
index 0d84c42c624e080595b715b3d4459629c7bb9dd5..6f17e2fa1a28ef519476cdfd9a278721e78b5ecd 100644 (file)
--- a/drivers/power/supply/da9052-battery.c
+++ b/drivers/power/supply/da9052-battery.c
@@ -648,7 +648,7 @@ static void da9052_bat_remove(struct platform_device *pdev)
 
 static struct platform_driver da9052_bat_driver = {
        .probe = da9052_bat_probe,
-       .remove_new = da9052_bat_remove,
+       .remove = da9052_bat_remove,
        .driver = {
                .name = "da9052-bat",
        },

diff --git a/drivers/power/supply/da9150-charger.c b/drivers/power/supply/da9150-charger.c
index b13cecd84f58912093eea5d7a4070c4b5861b446..27f36ef5b88dc4fd38df995bcf2e15b2ab7c54b2 100644 (file)
--- a/drivers/power/supply/da9150-charger.c
+++ b/drivers/power/supply/da9150-charger.c
@@ -636,7 +636,7 @@ static struct platform_driver da9150_charger_driver = {
                .name = "da9150-charger",
        },
        .probe = da9150_charger_probe,
-       .remove_new = da9150_charger_remove,
+       .remove = da9150_charger_remove,
 };
 
 module_platform_driver(da9150_charger_driver);

diff --git a/drivers/power/supply/ipaq_micro_battery.c b/drivers/power/supply/ipaq_micro_battery.c
index 66cc649f702afad63599bb9c5240be3ff9c6de96..7e0568a5353f16e14ba393f755e291f5e83f84e1 100644 (file)
--- a/drivers/power/supply/ipaq_micro_battery.c
+++ b/drivers/power/supply/ipaq_micro_battery.c
@@ -302,7 +302,7 @@ static struct platform_driver micro_batt_device_driver = {
                .pm     = &micro_batt_dev_pm_ops,
        },
        .probe          = micro_batt_probe,
-       .remove_new     = micro_batt_remove,
+       .remove         = micro_batt_remove,
 };
 module_platform_driver(micro_batt_device_driver);
 

diff --git a/drivers/power/supply/isp1704_charger.c b/drivers/power/supply/isp1704_charger.c
index 860d8614c98fd384fb974d2495ecaea68e9919b9..237912a9227245c28780cde02cdf66b5883a75ba 100644 (file)
--- a/drivers/power/supply/isp1704_charger.c
+++ b/drivers/power/supply/isp1704_charger.c
@@ -501,7 +501,7 @@ static struct platform_driver isp1704_charger_driver = {
                .of_match_table = of_match_ptr(omap_isp1704_of_match),
        },
        .probe = isp1704_charger_probe,
-       .remove_new = isp1704_charger_remove,
+       .remove = isp1704_charger_remove,
 };
 
 module_platform_driver(isp1704_charger_driver);

diff --git a/drivers/power/supply/lp8788-charger.c b/drivers/power/supply/lp8788-charger.c
index 72b170b4ac46a7dfac94668accefecd763fc980f..f0a680c155c485df29513f51d48f7dd966a72af6 100644 (file)
--- a/drivers/power/supply/lp8788-charger.c
+++ b/drivers/power/supply/lp8788-charger.c
@@ -716,7 +716,7 @@ static void lp8788_charger_remove(struct platform_device *pdev)
 
 static struct platform_driver lp8788_charger_driver = {
        .probe = lp8788_charger_probe,
-       .remove_new = lp8788_charger_remove,
+       .remove = lp8788_charger_remove,
        .driver = {
                .name = LP8788_DEV_CHARGER,
        },

diff --git a/drivers/power/supply/max14577_charger.c b/drivers/power/supply/max14577_charger.c
index b28c04157709a75881d63b73b0714e3b76433c48..1cef2f860b5fccbe572389269870fad2486c7f54 100644 (file)
--- a/drivers/power/supply/max14577_charger.c
+++ b/drivers/power/supply/max14577_charger.c
@@ -634,7 +634,7 @@ static struct platform_driver max14577_charger_driver = {
                .of_match_table = of_max14577_charger_dt_match,
        },
        .probe          = max14577_charger_probe,
-       .remove_new     = max14577_charger_remove,
+       .remove         = max14577_charger_remove,
        .id_table       = max14577_charger_id,
 };
 module_platform_driver(max14577_charger_driver);

diff --git a/drivers/power/supply/max77650-charger.c b/drivers/power/supply/max77650-charger.c
index 818e13c613e3552ef478e3ae05cb5f0e905044bc..5f58c0c24b4d63bad410ea086c6ccf6b2a6fcf15 100644 (file)
--- a/drivers/power/supply/max77650-charger.c
+++ b/drivers/power/supply/max77650-charger.c
@@ -364,7 +364,7 @@ static struct platform_driver max77650_charger_driver = {
                .of_match_table = max77650_charger_of_match,
        },
        .probe = max77650_charger_probe,
-       .remove_new = max77650_charger_remove,
+       .remove = max77650_charger_remove,
 };
 module_platform_driver(max77650_charger_driver);
 

diff --git a/drivers/power/supply/max77693_charger.c b/drivers/power/supply/max77693_charger.c
index 4caac142c4285a3c9d4a114808219d508ae2d57a..cdea35c0d1de1111311d198d042bfa5b10da52b7 100644 (file)
--- a/drivers/power/supply/max77693_charger.c
+++ b/drivers/power/supply/max77693_charger.c
@@ -798,7 +798,7 @@ static struct platform_driver max77693_charger_driver = {
                .name   = "max77693-charger",
        },
        .probe          = max77693_charger_probe,
-       .remove_new     = max77693_charger_remove,
+       .remove         = max77693_charger_remove,
        .id_table       = max77693_charger_id,
 };
 module_platform_driver(max77693_charger_driver);

diff --git a/drivers/power/supply/max8925_power.c b/drivers/power/supply/max8925_power.c
index fc24a6d3b63d8fbd3241df5303e7ce62f96a4935..d753145de3bb38dcde9ce437569da4afe7ab9c95 100644 (file)
--- a/drivers/power/supply/max8925_power.c
+++ b/drivers/power/supply/max8925_power.c
@@ -563,7 +563,7 @@ static void max8925_power_remove(struct platform_device *pdev)
 
 static struct platform_driver max8925_power_driver = {
        .probe  = max8925_power_probe,
-       .remove_new = max8925_power_remove,
+       .remove = max8925_power_remove,
        .driver = {
                .name   = "max8925-power",
        },

diff --git a/drivers/power/supply/pcf50633-charger.c b/drivers/power/supply/pcf50633-charger.c
index 0e980522fee513d2ef053f4b2a2f4e8e39710e02..0136bc87b105e13ea05ec36c9c0aaf0e3dc88d56 100644 (file)
--- a/drivers/power/supply/pcf50633-charger.c
+++ b/drivers/power/supply/pcf50633-charger.c
@@ -455,7 +455,7 @@ static struct platform_driver pcf50633_mbc_driver = {
                .name = "pcf50633-mbc",
        },
        .probe = pcf50633_mbc_probe,
-       .remove_new = pcf50633_mbc_remove,
+       .remove = pcf50633_mbc_remove,
 };
 
 module_platform_driver(pcf50633_mbc_driver);

diff --git a/drivers/power/supply/qcom_smbb.c b/drivers/power/supply/qcom_smbb.c
index 4e57762e27badc797f957c27f0175cfd2f715c48..a79563f6ff7a0c1b7d4aab85f6a42cc27fbb43ca 100644 (file)
--- a/drivers/power/supply/qcom_smbb.c
+++ b/drivers/power/supply/qcom_smbb.c
@@ -1017,10 +1017,10 @@ static const struct of_device_id smbb_charger_id_table[] = {
 MODULE_DEVICE_TABLE(of, smbb_charger_id_table);
 
 static struct platform_driver smbb_charger_driver = {
-       .probe    = smbb_charger_probe,
-       .remove_new      = smbb_charger_remove,
-       .driver  = {
-               .name   = "qcom-smbb",
+       .probe = smbb_charger_probe,
+       .remove = smbb_charger_remove,
+       .driver = {
+               .name = "qcom-smbb",
                .of_match_table = smbb_charger_id_table,
        },
 };

diff --git a/drivers/power/supply/sc2731_charger.c b/drivers/power/supply/sc2731_charger.c
index b3d8b1ca97da701c8a9b07ff7ea200774e8338c8..50d5157af9277dc09fe24852747f4f62e72bc712 100644 (file)
--- a/drivers/power/supply/sc2731_charger.c
+++ b/drivers/power/supply/sc2731_charger.c
@@ -530,7 +530,7 @@ static struct platform_driver sc2731_charger_driver = {
                .of_match_table = sc2731_charger_of_match,
        },
        .probe = sc2731_charger_probe,
-       .remove_new = sc2731_charger_remove,
+       .remove = sc2731_charger_remove,
 };
 
 module_platform_driver(sc2731_charger_driver);

diff --git a/drivers/power/supply/tps65090-charger.c b/drivers/power/supply/tps65090-charger.c
index d41595764caa52baeb731449661fba516c5de743..d65193e410a6251e80e481ed6fc3d36128c5678c 100644 (file)
--- a/drivers/power/supply/tps65090-charger.c
+++ b/drivers/power/supply/tps65090-charger.c
@@ -343,7 +343,7 @@ static struct platform_driver tps65090_charger_driver = {
                .of_match_table = of_tps65090_charger_match,
        },
        .probe  = tps65090_charger_probe,
-       .remove_new = tps65090_charger_remove,
+       .remove = tps65090_charger_remove,
 };
 module_platform_driver(tps65090_charger_driver);
 

diff --git a/drivers/power/supply/tps65217_charger.c b/drivers/power/supply/tps65217_charger.c
index 2382749a2f5311f384c8f68b83aab90329baf660..6fff44e1ecac80797fd33cdc3c10b0c23ce19c28 100644 (file)
--- a/drivers/power/supply/tps65217_charger.c
+++ b/drivers/power/supply/tps65217_charger.c
@@ -269,7 +269,7 @@ MODULE_DEVICE_TABLE(of, tps65217_charger_match_table);
 
 static struct platform_driver tps65217_charger_driver = {
        .probe  = tps65217_charger_probe,
-       .remove_new = tps65217_charger_remove,
+       .remove = tps65217_charger_remove,
        .driver = {
                .name   = "tps65217-charger",
                .of_match_table = of_match_ptr(tps65217_charger_match_table),

diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index f3f1a0862e935c17a5dbea9599afa1bb51250979..9dcb5457bef41ca616ea48ef5550bac08ce029e5 100644 (file)
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -1133,7 +1133,7 @@ MODULE_DEVICE_TABLE(of, twl_bci_of_match);
 
 static struct platform_driver twl4030_bci_driver = {
        .probe = twl4030_bci_probe,
-       .remove_new = twl4030_bci_remove,
+       .remove = twl4030_bci_remove,
        .driver = {
                .name   = "twl4030_bci",
                .of_match_table = of_match_ptr(twl_bci_of_match),

diff --git a/drivers/power/supply/wm831x_power.c b/drivers/power/supply/wm831x_power.c
index d56e499ac59fb19e268cce89e48488fd835cf5a8..538055b29decb3fab9a2069f651861cfb4552dd2 100644 (file)
--- a/drivers/power/supply/wm831x_power.c
+++ b/drivers/power/supply/wm831x_power.c
@@ -720,7 +720,7 @@ static void wm831x_power_remove(struct platform_device *pdev)
 
 static struct platform_driver wm831x_power_driver = {
        .probe = wm831x_power_probe,
-       .remove_new = wm831x_power_remove,
+       .remove = wm831x_power_remove,
        .driver = {
                .name = "wm831x-power",
        },

diff --git a/drivers/power/supply/wm8350_power.c b/drivers/power/supply/wm8350_power.c
index 3f79ab6f6abf1c7081e9493079ba58c2784ea3df..b0eb6e0ce8bcfa3ae9a6653d3f59dcab30859003 100644 (file)
--- a/drivers/power/supply/wm8350_power.c
+++ b/drivers/power/supply/wm8350_power.c
@@ -577,7 +577,7 @@ static void wm8350_power_remove(struct platform_device *pdev)
 
 static struct platform_driver wm8350_power_driver = {
        .probe = wm8350_power_probe,
-       .remove_new = wm8350_power_remove,
+       .remove = wm8350_power_remove,
        .driver = {
                .name = "wm8350-power",
        },

diff --git a/drivers/power/supply/wm97xx_battery.c b/drivers/power/supply/wm97xx_battery.c
index 1cc38d1437d91fe78c3ef26957c47e4338d36bbe..b3b0c37a9dd2d5bc0a3dbabb16897db6fd6c9879 100644 (file)
--- a/drivers/power/supply/wm97xx_battery.c
+++ b/drivers/power/supply/wm97xx_battery.c
@@ -265,7 +265,7 @@ static struct platform_driver wm97xx_bat_driver = {
 #endif
        },
        .probe          = wm97xx_bat_probe,
-       .remove_new     = wm97xx_bat_remove,
+       .remove         = wm97xx_bat_remove,
 };
 
 module_platform_driver(wm97xx_bat_driver);