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

[pandora-kernel.git] / drivers / power / abx500_chargalg.c

diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c
index a8acfe5..8b69da0 100644 (file)
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@ -1782,7 +1782,7 @@ static int abx500_chargalg_suspend(struct platform_device *pdev,
 #define abx500_chargalg_resume       NULL
 #endif
 
-static int __devexit abx500_chargalg_remove(struct platform_device *pdev)
+static int abx500_chargalg_remove(struct platform_device *pdev)
 {
        struct abx500_chargalg *di = platform_get_drvdata(pdev);
 
@@ -1803,7 +1803,7 @@ static char *supply_interface[] = {
        "ab8500_fg",
 };
 
-static int __devinit abx500_chargalg_probe(struct platform_device *pdev)
+static int abx500_chargalg_probe(struct platform_device *pdev)
 {
        struct device_node *np = pdev->dev.of_node;
        struct abx500_bm_data *plat = pdev->dev.platform_data;
@@ -1911,7 +1911,7 @@ static const struct of_device_id ab8500_chargalg_match[] = {
 
 static struct platform_driver abx500_chargalg_driver = {
        .probe = abx500_chargalg_probe,
-       .remove = __devexit_p(abx500_chargalg_remove),
+       .remove = abx500_chargalg_remove,
        .suspend = abx500_chargalg_suspend,
        .resume = abx500_chargalg_resume,
        .driver = {