4 files changed, 24 insertions, 29 deletions

diff --git a/drivers/power/ab8500_bmdata.c b/drivers/power/ab8500_bmdata.c
index 03cc528425cb..f034ae43e045 100644
--- a/drivers/power/ab8500_bmdata.c
+++ b/drivers/power/ab8500_bmdata.c
@@ -452,10 +452,8 @@ struct abx500_bm_data ab8500_bm_data = {
         .fg_params              = &fg,
 };
 
-int __devinit
-bmdevs_of_probe(struct device *dev,
-                struct device_node *np,
-                struct abx500_bm_data **battery)
+int bmdevs_of_probe(struct device *dev, struct device_node *np,
+                    struct abx500_bm_data **battery)
 {
         struct  abx500_battery_type *btype;
         struct  device_node *np_bat_supply;
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c
index 298c47d111b4..1ec810ada5ed 100644
--- a/drivers/power/olpc_battery.c
+++ b/drivers/power/olpc_battery.c
@@ -668,7 +668,7 @@ static int olpc_battery_remove(struct platform_device *pdev)
         return 0;
 }
 
-static const struct of_device_id olpc_battery_ids[] __devinitconst = {
+static const struct of_device_id olpc_battery_ids[] = {
         { .compatible = "olpc,xo1-battery" },
         {}
 };
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index 0491e5335d02..e290d48ddd99 100644
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -29,15 +29,16 @@ static int gpio_active_low;
 
 static void gpio_poweroff_do_poweroff(void)
 {
-        BUG_ON(gpio_num == -1);
+        BUG_ON(!gpio_is_valid(gpio_num));
 
-        /* drive it active */
+        /* drive it active, also inactive->active edge */
         gpio_direction_output(gpio_num, !gpio_active_low);
         mdelay(100);
-        /* rising edge or drive inactive */
+        /* drive inactive, also active->inactive edge */
         gpio_set_value(gpio_num, gpio_active_low);
         mdelay(100);
-        /* falling edge */
+
+        /* drive it active, also inactive->active edge */
         gpio_set_value(gpio_num, !gpio_active_low);
 
         /* give it some time */
@@ -46,7 +47,7 @@ static void gpio_poweroff_do_poweroff(void)
         WARN_ON(1);
 }
 
-static int __devinit gpio_poweroff_probe(struct platform_device *pdev)
+static int gpio_poweroff_probe(struct platform_device *pdev)
 {
         enum of_gpio_flags flags;
         bool input = false;
@@ -60,15 +61,12 @@ static int __devinit gpio_poweroff_probe(struct platform_device *pdev)
         }
 
         gpio_num = of_get_gpio_flags(pdev->dev.of_node, 0, &flags);
-        if (gpio_num < 0) {
-                pr_err("%s: Could not get GPIO configuration: %d",
-                       __func__, gpio_num);
-                return -ENODEV;
-        }
+        if (!gpio_is_valid(gpio_num))
+                return gpio_num;
+
         gpio_active_low = flags & OF_GPIO_ACTIVE_LOW;
 
-        if (of_get_property(pdev->dev.of_node, "input", NULL))
-                input = true;
+        input = of_property_read_bool(pdev->dev.of_node, "input");
 
         ret = gpio_request(gpio_num, "poweroff-gpio");
         if (ret) {
@@ -96,10 +94,9 @@ err:
         return -ENODEV;
 }
 
-static int __devexit gpio_poweroff_remove(struct platform_device *pdev)
+static int gpio_poweroff_remove(struct platform_device *pdev)
 {
-        if (gpio_num != -1)
-                gpio_free(gpio_num);
+        gpio_free(gpio_num);
         if (pm_power_off == &gpio_poweroff_do_poweroff)
                 pm_power_off = NULL;
 
@@ -113,17 +110,17 @@ static const struct of_device_id of_gpio_poweroff_match[] = {
 
 static struct platform_driver gpio_poweroff_driver = {
         .probe = gpio_poweroff_probe,
-        .remove = __devexit_p(gpio_poweroff_remove),
+        .remove = gpio_poweroff_remove,
         .driver = {
-                   .name = "poweroff-gpio",
-                   .owner = THIS_MODULE,
-                   .of_match_table = of_gpio_poweroff_match,
-                   },
+                .name = "poweroff-gpio",
+                .owner = THIS_MODULE,
+                .of_match_table = of_gpio_poweroff_match,
+        },
 };
 
 module_platform_driver(gpio_poweroff_driver);
 
 MODULE_AUTHOR("Jamie Lentin <jm@lentin.co.uk>");
 MODULE_DESCRIPTION("GPIO poweroff driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:poweroff-gpio");
diff --git a/drivers/power/rx51_battery.c b/drivers/power/rx51_battery.c
index ca49d6c0ee9d..8208888b844e 100644
--- a/drivers/power/rx51_battery.c
+++ b/drivers/power/rx51_battery.c
@@ -197,7 +197,7 @@ static enum power_supply_property rx51_battery_props[] = {
         POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
 };
 
-static int __devinit rx51_battery_probe(struct platform_device *pdev)
+static int rx51_battery_probe(struct platform_device *pdev)
 {
         struct rx51_device_info *di;
         int ret;
@@ -224,7 +224,7 @@ static int __devinit rx51_battery_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit rx51_battery_remove(struct platform_device *pdev)
+static int rx51_battery_remove(struct platform_device *pdev)
 {
         struct rx51_device_info *di = platform_get_drvdata(pdev);
 
@@ -237,7 +237,7 @@ static int __devexit rx51_battery_remove(struct platform_device *pdev)
 
 static struct platform_driver rx51_battery_driver = {
         .probe = rx51_battery_probe,
-        .remove = __devexit_p(rx51_battery_remove),
+        .remove = rx51_battery_remove,
         .driver = {
                 .name = "rx51-battery",
                 .owner = THIS_MODULE,