Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[firefly-linux-kernel-4.4.55.git] / drivers / power / power_supply_core.c

diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 26518c8218ea32203c3ce74f42ee5578a773186e..6cb7fe5c022d48ca237e31eb89e78f8f70665776 100644 (file)
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -179,19 +179,6 @@ static int  __power_supply_find_supply_from_node(struct device *dev,
 static int power_supply_find_supply_from_node(struct device_node *supply_node)
 {
        int error;
-       struct device *dev;
-       struct class_dev_iter iter;
-
-       /*
-        * Use iterator to see if any other device is registered.
-        * This is required since class_for_each_device returns 0
-        * if there are no devices registered.
-        */
-       class_dev_iter_init(&iter, power_supply_class, NULL, NULL);
-       dev = class_dev_iter_next(&iter);
-
-       if (!dev)
-               return -EPROBE_DEFER;
 
        /*
         * class_for_each_device() either returns its own errors or values
@@ -435,9 +422,7 @@ static int psy_register_thermal(struct power_supply *psy)
                if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) {
                        psy->tzd = thermal_zone_device_register(psy->name, 0, 0,
                                        psy, &psy_tzd_ops, NULL, 0, 0);
-                       if (IS_ERR(psy->tzd))
-                               return PTR_ERR(psy->tzd);
-                       break;
+                       return PTR_ERR_OR_ZERO(psy->tzd);
                }
        }
        return 0;
@@ -515,9 +500,7 @@ static int psy_register_cooler(struct power_supply *psy)
                        psy->tcd = thermal_cooling_device_register(
                                                        (char *)psy->name,
                                                        psy, &psy_tcd_ops);
-                       if (IS_ERR(psy->tcd))
-                               return PTR_ERR(psy->tcd);
-                       break;
+                       return PTR_ERR_OR_ZERO(psy->tcd);
                }
        }
        return 0;
@@ -603,7 +586,7 @@ static int __power_supply_register(struct device *parent,
 
        power_supply_changed(psy);
 
-       goto success;
+       return 0;
 
 create_triggers_failed:
        psy_unregister_cooler(psy);
@@ -616,7 +599,6 @@ wakeup_init_failed:
 check_supplies_failed:
 dev_set_name_failed:
        put_device(dev);
-success:
        return rc;
 }