Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / power / ab8500_fg.c

diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index df681a80d8a4adc9438e5dcfa7cd593de342d6e0..3d05c73813c8a594fcbc2ec220c063653c3d953b 100644 (file)
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2410,7 +2410,7 @@ static int ab8500_fg_suspend(struct platform_device *pdev,
 #define ab8500_fg_resume       NULL
 #endif
 
-static int __devexit ab8500_fg_remove(struct platform_device *pdev)
+static int ab8500_fg_remove(struct platform_device *pdev)
 {
        int ret = 0;
        struct ab8500_fg *di = platform_get_drvdata(pdev);
@@ -2445,7 +2445,7 @@ static char *supply_interface[] = {
        "ab8500_usb",
 };
 
-static int __devinit ab8500_fg_probe(struct platform_device *pdev)
+static int ab8500_fg_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
        struct abx500_bm_data *plat = pdev->dev.platform_data;
@@ -2614,7 +2614,7 @@ static const struct of_device_id ab8500_fg_match[] = {
 
 static struct platform_driver ab8500_fg_driver = {
        .probe = ab8500_fg_probe,
-       .remove = __devexit_p(ab8500_fg_remove),
+       .remove = ab8500_fg_remove,
        .suspend = ab8500_fg_suspend,
        .resume = ab8500_fg_resume,
        .driver = {