1 files changed, 51 insertions, 37 deletions

diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
index 71c087e3feaf..57eb5c2bfc21 100644
--- a/drivers/power/max8925_power.c
+++ b/drivers/power/max8925_power.c
@@ -68,9 +68,9 @@ struct max8925_power_info {
         struct i2c_client       *gpm;
         struct i2c_client       *adc;
 
-        struct power_supply     ac;
-        struct power_supply     usb;
-        struct power_supply     battery;
+        struct power_supply     *ac;
+        struct power_supply     *usb;
+        struct power_supply     *battery;
         int                     irq_base;
         unsigned                ac_online:1;
         unsigned                usb_online:1;
@@ -196,7 +196,7 @@ static int max8925_ac_get_prop(struct power_supply *psy,
                                enum power_supply_property psp,
                                union power_supply_propval *val)
 {
-        struct max8925_power_info *info = dev_get_drvdata(psy->dev->parent);
+        struct max8925_power_info *info = dev_get_drvdata(psy->dev.parent);
         int ret = 0;
 
         switch (psp) {
@@ -230,7 +230,7 @@ static int max8925_usb_get_prop(struct power_supply *psy,
                                 enum power_supply_property psp,
                                 union power_supply_propval *val)
 {
-        struct max8925_power_info *info = dev_get_drvdata(psy->dev->parent);
+        struct max8925_power_info *info = dev_get_drvdata(psy->dev.parent);
         int ret = 0;
 
         switch (psp) {
@@ -264,7 +264,7 @@ static int max8925_bat_get_prop(struct power_supply *psy,
                                 enum power_supply_property psp,
                                 union power_supply_propval *val)
 {
-        struct max8925_power_info *info = dev_get_drvdata(psy->dev->parent);
+        struct max8925_power_info *info = dev_get_drvdata(psy->dev.parent);
         int ret = 0;
 
         switch (psp) {
@@ -347,6 +347,30 @@ static enum power_supply_property max8925_battery_props[] = {
         POWER_SUPPLY_PROP_STATUS,
 };
 
+static const struct power_supply_desc ac_desc = {
+        .name           = "max8925-ac",
+        .type           = POWER_SUPPLY_TYPE_MAINS,
+        .properties     = max8925_ac_props,
+        .num_properties = ARRAY_SIZE(max8925_ac_props),
+        .get_property   = max8925_ac_get_prop,
+};
+
+static const struct power_supply_desc usb_desc = {
+        .name           = "max8925-usb",
+        .type           = POWER_SUPPLY_TYPE_USB,
+        .properties     = max8925_usb_props,
+        .num_properties = ARRAY_SIZE(max8925_usb_props),
+        .get_property   = max8925_usb_get_prop,
+};
+
+static const struct power_supply_desc battery_desc = {
+        .name           = "max8925-battery",
+        .type           = POWER_SUPPLY_TYPE_BATTERY,
+        .properties     = max8925_battery_props,
+        .num_properties = ARRAY_SIZE(max8925_battery_props),
+        .get_property   = max8925_bat_get_prop,
+};
+
 #define REQUEST_IRQ(_irq, _name)                                        \
 do {                                                                    \
         ret = request_threaded_irq(chip->irq_base + _irq, NULL,         \
@@ -506,36 +530,26 @@ static int max8925_power_probe(struct platform_device *pdev)
         psy_cfg.supplied_to = pdata->supplied_to;
         psy_cfg.num_supplicants = pdata->num_supplicants;
 
-        info->ac.name = "max8925-ac";
-        info->ac.type = POWER_SUPPLY_TYPE_MAINS;
-        info->ac.properties = max8925_ac_props;
-        info->ac.num_properties = ARRAY_SIZE(max8925_ac_props);
-        info->ac.get_property = max8925_ac_get_prop;
-        ret = power_supply_register(&pdev->dev, &info->ac, &psy_cfg);
-        if (ret)
+        info->ac = power_supply_register(&pdev->dev, &ac_desc, &psy_cfg);
+        if (IS_ERR(info->ac)) {
+                ret = PTR_ERR(info->ac);
                 goto out;
-        info->ac.dev->parent = &pdev->dev;
-
-        info->usb.name = "max8925-usb";
-        info->usb.type = POWER_SUPPLY_TYPE_USB;
-        info->usb.properties = max8925_usb_props;
-        info->usb.num_properties = ARRAY_SIZE(max8925_usb_props);
-        info->usb.get_property = max8925_usb_get_prop;
+        }
+        info->ac->dev.parent = &pdev->dev;
 
-        ret = power_supply_register(&pdev->dev, &info->usb, &psy_cfg);
-        if (ret)
+        info->usb = power_supply_register(&pdev->dev, &usb_desc, &psy_cfg);
+        if (IS_ERR(info->usb)) {
+                ret = PTR_ERR(info->usb);
                 goto out_usb;
-        info->usb.dev->parent = &pdev->dev;
-
-        info->battery.name = "max8925-battery";
-        info->battery.type = POWER_SUPPLY_TYPE_BATTERY;
-        info->battery.properties = max8925_battery_props;
-        info->battery.num_properties = ARRAY_SIZE(max8925_battery_props);
-        info->battery.get_property = max8925_bat_get_prop;
-        ret = power_supply_register(&pdev->dev, &info->battery, NULL);
-        if (ret)
+        }
+        info->usb->dev.parent = &pdev->dev;
+
+        info->battery = power_supply_register(&pdev->dev, &battery_desc, NULL);
+        if (IS_ERR(info->battery)) {
+                ret = PTR_ERR(info->battery);
                 goto out_battery;
-        info->battery.dev->parent = &pdev->dev;
+        }
+        info->battery->dev.parent = &pdev->dev;
 
         info->batt_detect = pdata->batt_detect;
         info->topoff_threshold = pdata->topoff_threshold;
@@ -547,9 +561,9 @@ static int max8925_power_probe(struct platform_device *pdev)
         max8925_init_charger(chip, info);
         return 0;
 out_battery:
-        power_supply_unregister(&info->battery);
+        power_supply_unregister(info->battery);
 out_usb:
-        power_supply_unregister(&info->ac);
+        power_supply_unregister(info->ac);
 out:
         return ret;
 }
@@ -559,9 +573,9 @@ static int max8925_power_remove(struct platform_device *pdev)
         struct max8925_power_info *info = platform_get_drvdata(pdev);
 
         if (info) {
-                power_supply_unregister(&info->ac);
-                power_supply_unregister(&info->usb);
-                power_supply_unregister(&info->battery);
+                power_supply_unregister(info->ac);
+                power_supply_unregister(info->usb);
+                power_supply_unregister(info->battery);
                 max8925_deinit_charger(info);
         }
         return 0;