1 files changed, 14 insertions, 11 deletions

diff --git a/drivers/power/da9052-battery.c b/drivers/power/da9052-battery.c
index 54ba9ddb6d4f..830ec46fe7d0 100644
--- a/drivers/power/da9052-battery.c
+++ b/drivers/power/da9052-battery.c
@@ -169,7 +169,7 @@ static u32 const vc_tbl[3][68][2] = {
 
 struct da9052_battery {
         struct da9052 *da9052;
-        struct power_supply psy;
+        struct power_supply *psy;
         struct notifier_block nb;
         int charger_type;
         int status;
@@ -452,7 +452,7 @@ static irqreturn_t da9052_bat_irq(int irq, void *data)
 
         if (irq == DA9052_IRQ_CHGEND || irq == DA9052_IRQ_DCIN ||
             irq == DA9052_IRQ_VBUS || irq == DA9052_IRQ_TBAT) {
-                power_supply_changed(&bat->psy);
+                power_supply_changed(bat->psy);
         }
 
         return IRQ_HANDLED;
@@ -499,8 +499,7 @@ static int da9052_bat_get_property(struct power_supply *psy,
 {
         int ret;
         int illegal;
-        struct da9052_battery *bat = container_of(psy, struct da9052_battery,
-                                                  psy);
+        struct da9052_battery *bat = power_supply_get_drvdata(psy);
 
         ret = da9052_bat_check_presence(bat, &illegal);
         if (ret < 0)
@@ -561,7 +560,7 @@ static enum power_supply_property da9052_bat_props[] = {
         POWER_SUPPLY_PROP_TECHNOLOGY,
 };
 
-static struct power_supply template_battery = {
+static struct power_supply_desc psy_desc = {
         .name           = "da9052-bat",
         .type           = POWER_SUPPLY_TYPE_BATTERY,
         .properties     = da9052_bat_props,
@@ -591,6 +590,7 @@ static s32 da9052_bat_probe(struct platform_device *pdev)
 {
         struct da9052_pdata *pdata;
         struct da9052_battery *bat;
+        struct power_supply_config psy_cfg = {};
         int ret;
         int i;
 
@@ -599,8 +599,9 @@ static s32 da9052_bat_probe(struct platform_device *pdev)
         if (!bat)
                 return -ENOMEM;
 
+        psy_cfg.drv_data = bat;
+
         bat->da9052 = dev_get_drvdata(pdev->dev.parent);
-        bat->psy = template_battery;
         bat->charger_type = DA9052_NOCHARGER;
         bat->status = POWER_SUPPLY_STATUS_UNKNOWN;
         bat->health = POWER_SUPPLY_HEALTH_UNKNOWN;
@@ -608,9 +609,9 @@ static s32 da9052_bat_probe(struct platform_device *pdev)
 
         pdata = bat->da9052->dev->platform_data;
         if (pdata != NULL && pdata->use_for_apm)
-                bat->psy.use_for_apm = pdata->use_for_apm;
+                psy_desc.use_for_apm = pdata->use_for_apm;
         else
-                bat->psy.use_for_apm = 1;
+                psy_desc.use_for_apm = 1;
 
         for (i = 0; i < ARRAY_SIZE(da9052_bat_irqs); i++) {
                 ret = da9052_request_irq(bat->da9052,
@@ -625,9 +626,11 @@ static s32 da9052_bat_probe(struct platform_device *pdev)
                 }
         }
 
-        ret = power_supply_register(&pdev->dev, &bat->psy, NULL);
-         if (ret)
+        bat->psy = power_supply_register(&pdev->dev, &psy_desc, &psy_cfg);
+        if (IS_ERR(bat->psy)) {
+                ret = PTR_ERR(bat->psy);
                 goto err;
+        }
 
         platform_set_drvdata(pdev, bat);
         return 0;
@@ -646,7 +649,7 @@ static int da9052_bat_remove(struct platform_device *pdev)
         for (i = 0; i < ARRAY_SIZE(da9052_bat_irqs); i++)
                 da9052_free_irq(bat->da9052, da9052_bat_irq_bits[i], bat);
 
-        power_supply_unregister(&bat->psy);
+        power_supply_unregister(bat->psy);
 
         return 0;
 }