1 files changed, 54 insertions, 41 deletions

diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c
index 88fe7db2afcf..d05597b4e40f 100644
--- a/drivers/power/pcf50633-charger.c
+++ b/drivers/power/pcf50633-charger.c
@@ -33,9 +33,9 @@ struct pcf50633_mbc {
         int adapter_online;
         int usb_online;
 
-        struct power_supply usb;
-        struct power_supply adapter;
-        struct power_supply ac;
+        struct power_supply *usb;
+        struct power_supply *adapter;
+        struct power_supply *ac;
 };
 
 int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma)
@@ -104,7 +104,7 @@ int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma)
                                 PCF50633_MBCC1_CHGENA, PCF50633_MBCC1_CHGENA);
         }
 
-        power_supply_changed(&mbc->usb);
+        power_supply_changed(mbc->usb);
 
         return ret;
 }
@@ -278,9 +278,9 @@ pcf50633_mbc_irq_handler(int irq, void *data)
         else if (irq == PCF50633_IRQ_ADPREM)
                 mbc->adapter_online = 0;
 
-        power_supply_changed(&mbc->ac);
-        power_supply_changed(&mbc->usb);
-        power_supply_changed(&mbc->adapter);
+        power_supply_changed(mbc->ac);
+        power_supply_changed(mbc->usb);
+        power_supply_changed(mbc->adapter);
 
         if (mbc->pcf->pdata->mbc_event_callback)
                 mbc->pcf->pdata->mbc_event_callback(mbc->pcf, irq);
@@ -290,8 +290,7 @@ static int adapter_get_property(struct power_supply *psy,
                         enum power_supply_property psp,
                         union power_supply_propval *val)
 {
-        struct pcf50633_mbc *mbc = container_of(psy,
-                                struct pcf50633_mbc, adapter);
+        struct pcf50633_mbc *mbc = power_supply_get_drvdata(psy);
         int ret = 0;
 
         switch (psp) {
@@ -309,7 +308,7 @@ static int usb_get_property(struct power_supply *psy,
                         enum power_supply_property psp,
                         union power_supply_propval *val)
 {
-        struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, usb);
+        struct pcf50633_mbc *mbc = power_supply_get_drvdata(psy);
         int ret = 0;
         u8 usblim = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCC7) &
                                                 PCF50633_MBCC7_USB_MASK;
@@ -330,7 +329,7 @@ static int ac_get_property(struct power_supply *psy,
                         enum power_supply_property psp,
                         union power_supply_propval *val)
 {
-        struct pcf50633_mbc *mbc = container_of(psy, struct pcf50633_mbc, ac);
+        struct pcf50633_mbc *mbc = power_supply_get_drvdata(psy);
         int ret = 0;
         u8 usblim = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCC7) &
                                                 PCF50633_MBCC7_USB_MASK;
@@ -366,6 +365,30 @@ static const u8 mbc_irq_handlers[] = {
         PCF50633_IRQ_LOWBAT,
 };
 
+static const struct power_supply_desc pcf50633_mbc_adapter_desc = {
+        .name           = "adapter",
+        .type           = POWER_SUPPLY_TYPE_MAINS,
+        .properties     = power_props,
+        .num_properties = ARRAY_SIZE(power_props),
+        .get_property   = &adapter_get_property,
+};
+
+static const struct power_supply_desc pcf50633_mbc_usb_desc = {
+        .name           = "usb",
+        .type           = POWER_SUPPLY_TYPE_USB,
+        .properties     = power_props,
+        .num_properties = ARRAY_SIZE(power_props),
+        .get_property   = usb_get_property,
+};
+
+static const struct power_supply_desc pcf50633_mbc_ac_desc = {
+        .name           = "ac",
+        .type           = POWER_SUPPLY_TYPE_MAINS,
+        .properties     = power_props,
+        .num_properties = ARRAY_SIZE(power_props),
+        .get_property   = ac_get_property,
+};
+
 static int pcf50633_mbc_probe(struct platform_device *pdev)
 {
         struct power_supply_config psy_cfg = {};
@@ -388,44 +411,34 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
 
         psy_cfg.supplied_to             = mbc->pcf->pdata->batteries;
         psy_cfg.num_supplicants         = mbc->pcf->pdata->num_batteries;
+        psy_cfg.drv_data                = mbc;
 
         /* Create power supplies */
-        mbc->adapter.name               = "adapter";
-        mbc->adapter.type               = POWER_SUPPLY_TYPE_MAINS;
-        mbc->adapter.properties         = power_props;
-        mbc->adapter.num_properties     = ARRAY_SIZE(power_props);
-        mbc->adapter.get_property       = &adapter_get_property;
-
-        mbc->usb.name                   = "usb";
-        mbc->usb.type                   = POWER_SUPPLY_TYPE_USB;
-        mbc->usb.properties             = power_props;
-        mbc->usb.num_properties         = ARRAY_SIZE(power_props);
-        mbc->usb.get_property           = usb_get_property;
-
-        mbc->ac.name                    = "ac";
-        mbc->ac.type                    = POWER_SUPPLY_TYPE_MAINS;
-        mbc->ac.properties              = power_props;
-        mbc->ac.num_properties          = ARRAY_SIZE(power_props);
-        mbc->ac.get_property            = ac_get_property;
-
-        ret = power_supply_register(&pdev->dev, &mbc->adapter, &psy_cfg);
-        if (ret) {
+        mbc->adapter = power_supply_register(&pdev->dev,
+                                             &pcf50633_mbc_adapter_desc,
+                                             &psy_cfg);
+        if (IS_ERR(mbc->adapter)) {
                 dev_err(mbc->pcf->dev, "failed to register adapter\n");
+                ret = PTR_ERR(mbc->adapter);
                 return ret;
         }
 
-        ret = power_supply_register(&pdev->dev, &mbc->usb, &psy_cfg);
-        if (ret) {
+        mbc->usb = power_supply_register(&pdev->dev, &pcf50633_mbc_usb_desc,
+                                         &psy_cfg);
+        if (IS_ERR(mbc->usb)) {
                 dev_err(mbc->pcf->dev, "failed to register usb\n");
-                power_supply_unregister(&mbc->adapter);
+                power_supply_unregister(mbc->adapter);
+                ret = PTR_ERR(mbc->usb);
                 return ret;
         }
 
-        ret = power_supply_register(&pdev->dev, &mbc->ac, &psy_cfg);
-        if (ret) {
+        mbc->ac = power_supply_register(&pdev->dev, &pcf50633_mbc_ac_desc,
+                                        &psy_cfg);
+        if (IS_ERR(mbc->ac)) {
                 dev_err(mbc->pcf->dev, "failed to register ac\n");
-                power_supply_unregister(&mbc->adapter);
-                power_supply_unregister(&mbc->usb);
+                power_supply_unregister(mbc->adapter);
+                power_supply_unregister(mbc->usb);
+                ret = PTR_ERR(mbc->ac);
                 return ret;
         }
 
@@ -452,9 +465,9 @@ static int pcf50633_mbc_remove(struct platform_device *pdev)
                 pcf50633_free_irq(mbc->pcf, mbc_irq_handlers[i]);
 
         sysfs_remove_group(&pdev->dev.kobj, &mbc_attr_group);
-        power_supply_unregister(&mbc->usb);
-        power_supply_unregister(&mbc->adapter);
-        power_supply_unregister(&mbc->ac);
+        power_supply_unregister(mbc->usb);
+        power_supply_unregister(mbc->adapter);
+        power_supply_unregister(mbc->ac);
 
         return 0;
 }