aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/max8925_power.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/power/max8925_power.c')
-rw-r--r--drivers/power/max8925_power.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
index daa333bd7ebb..1a075f1f1b67 100644
--- a/drivers/power/max8925_power.c
+++ b/drivers/power/max8925_power.c
@@ -356,7 +356,7 @@ do { \
356 _irq, ret); \ 356 _irq, ret); \
357} while (0) 357} while (0)
358 358
359static __devinit int max8925_init_charger(struct max8925_chip *chip, 359static int max8925_init_charger(struct max8925_chip *chip,
360 struct max8925_power_info *info) 360 struct max8925_power_info *info)
361{ 361{
362 int ret; 362 int ret;
@@ -414,7 +414,7 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip,
414 return 0; 414 return 0;
415} 415}
416 416
417static __devexit int max8925_deinit_charger(struct max8925_power_info *info) 417static int max8925_deinit_charger(struct max8925_power_info *info)
418{ 418{
419 struct max8925_chip *chip = info->chip; 419 struct max8925_chip *chip = info->chip;
420 int irq; 420 int irq;
@@ -426,7 +426,7 @@ static __devexit int max8925_deinit_charger(struct max8925_power_info *info)
426 return 0; 426 return 0;
427} 427}
428 428
429static __devinit int max8925_power_probe(struct platform_device *pdev) 429static int max8925_power_probe(struct platform_device *pdev)
430{ 430{
431 struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent); 431 struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
432 struct max8925_power_pdata *pdata = NULL; 432 struct max8925_power_pdata *pdata = NULL;
@@ -501,7 +501,7 @@ out:
501 return ret; 501 return ret;
502} 502}
503 503
504static __devexit int max8925_power_remove(struct platform_device *pdev) 504static int max8925_power_remove(struct platform_device *pdev)
505{ 505{
506 struct max8925_power_info *info = platform_get_drvdata(pdev); 506 struct max8925_power_info *info = platform_get_drvdata(pdev);
507 507
@@ -517,7 +517,7 @@ static __devexit int max8925_power_remove(struct platform_device *pdev)
517 517
518static struct platform_driver max8925_power_driver = { 518static struct platform_driver max8925_power_driver = {
519 .probe = max8925_power_probe, 519 .probe = max8925_power_probe,
520 .remove = __devexit_p(max8925_power_remove), 520 .remove = max8925_power_remove,
521 .driver = { 521 .driver = {
522 .name = "max8925-power", 522 .name = "max8925-power",
523 }, 523 },