aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/jz4740-battery.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/power/jz4740-battery.c')
-rw-r--r--drivers/power/jz4740-battery.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/jz4740-battery.c b/drivers/power/jz4740-battery.c
index ffbed5e5b945..74ac69e0687f 100644
--- a/drivers/power/jz4740-battery.c
+++ b/drivers/power/jz4740-battery.c
@@ -238,7 +238,7 @@ static void jz_battery_work(struct work_struct *work)
238 schedule_delayed_work(&jz_battery->work, interval); 238 schedule_delayed_work(&jz_battery->work, interval);
239} 239}
240 240
241static int __devinit jz_battery_probe(struct platform_device *pdev) 241static int jz_battery_probe(struct platform_device *pdev)
242{ 242{
243 int ret = 0; 243 int ret = 0;
244 struct jz_battery_platform_data *pdata = pdev->dev.parent->platform_data; 244 struct jz_battery_platform_data *pdata = pdev->dev.parent->platform_data;
@@ -376,7 +376,7 @@ err_free:
376 return ret; 376 return ret;
377} 377}
378 378
379static int __devexit jz_battery_remove(struct platform_device *pdev) 379static int jz_battery_remove(struct platform_device *pdev)
380{ 380{
381 struct jz_battery *jz_battery = platform_get_drvdata(pdev); 381 struct jz_battery *jz_battery = platform_get_drvdata(pdev);
382 382
@@ -431,7 +431,7 @@ static const struct dev_pm_ops jz_battery_pm_ops = {
431 431
432static struct platform_driver jz_battery_driver = { 432static struct platform_driver jz_battery_driver = {
433 .probe = jz_battery_probe, 433 .probe = jz_battery_probe,
434 .remove = __devexit_p(jz_battery_remove), 434 .remove = jz_battery_remove,
435 .driver = { 435 .driver = {
436 .name = "jz4740-battery", 436 .name = "jz4740-battery",
437 .owner = THIS_MODULE, 437 .owner = THIS_MODULE,