Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / power / supply / pcf50633-charger.c

diff --git a/drivers/power/supply/pcf50633-charger.c b/drivers/power/supply/pcf50633-charger.c
index d05597b4e40f5a613271f8bf0021560508e15997..b3c1873ad84db529888dec73596acabd4206d6c5 100644 (file)
--- a/drivers/power/supply/pcf50633-charger.c
+++ b/drivers/power/supply/pcf50633-charger.c
@@ -393,7 +393,6 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
 {
        struct power_supply_config psy_cfg = {};
        struct pcf50633_mbc *mbc;
-       int ret;
        int i;
        u8 mbcs1;
 
@@ -419,8 +418,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
                                             &psy_cfg);
        if (IS_ERR(mbc->adapter)) {
                dev_err(mbc->pcf->dev, "failed to register adapter\n");
-               ret = PTR_ERR(mbc->adapter);
-               return ret;
+               return PTR_ERR(mbc->adapter);
        }
 
        mbc->usb = power_supply_register(&pdev->dev, &pcf50633_mbc_usb_desc,
@@ -428,8 +426,7 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
        if (IS_ERR(mbc->usb)) {
                dev_err(mbc->pcf->dev, "failed to register usb\n");
                power_supply_unregister(mbc->adapter);
-               ret = PTR_ERR(mbc->usb);
-               return ret;
+               return PTR_ERR(mbc->usb);
        }
 
        mbc->ac = power_supply_register(&pdev->dev, &pcf50633_mbc_ac_desc,
@@ -438,12 +435,10 @@ static int pcf50633_mbc_probe(struct platform_device *pdev)
                dev_err(mbc->pcf->dev, "failed to register ac\n");
                power_supply_unregister(mbc->adapter);
                power_supply_unregister(mbc->usb);
-               ret = PTR_ERR(mbc->ac);
-               return ret;
+               return PTR_ERR(mbc->ac);
        }
 
-       ret = sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group);
-       if (ret)
+       if (sysfs_create_group(&pdev->dev.kobj, &mbc_attr_group))
                dev_err(mbc->pcf->dev, "failed to create sysfs entries\n");
 
        mbcs1 = pcf50633_reg_read(mbc->pcf, PCF50633_REG_MBCS1);