power: supply: bq2415x: fix race-condition in sysfs registration

[sfrench/cifs-2.6.git] / drivers / power / supply / bq2415x_charger.c

diff --git a/drivers/power/supply/bq2415x_charger.c b/drivers/power/supply/bq2415x_charger.c
index cbec70f3e73efe48e397abf58b0556876c25b098..6693e7aeead5a06abb0e0629e91fcb07e3c2a84d 100644 (file)
--- a/drivers/power/supply/bq2415x_charger.c
+++ b/drivers/power/supply/bq2415x_charger.c
@@ -1032,54 +1032,6 @@ static int bq2415x_power_supply_get_property(struct power_supply *psy,
        return 0;
 }
 
-static int bq2415x_power_supply_init(struct bq2415x_device *bq)
-{
-       int ret;
-       int chip;
-       char revstr[8];
-       struct power_supply_config psy_cfg = {
-               .drv_data = bq,
-               .of_node = bq->dev->of_node,
-       };
-
-       bq->charger_desc.name = bq->name;
-       bq->charger_desc.type = POWER_SUPPLY_TYPE_USB;
-       bq->charger_desc.properties = bq2415x_power_supply_props;
-       bq->charger_desc.num_properties =
-                       ARRAY_SIZE(bq2415x_power_supply_props);
-       bq->charger_desc.get_property = bq2415x_power_supply_get_property;
-
-       ret = bq2415x_detect_chip(bq);
-       if (ret < 0)
-               chip = BQUNKNOWN;
-       else
-               chip = ret;
-
-       ret = bq2415x_detect_revision(bq);
-       if (ret < 0)
-               strcpy(revstr, "unknown");
-       else
-               sprintf(revstr, "1.%d", ret);
-
-       bq->model = kasprintf(GFP_KERNEL,
-                               "chip %s, revision %s, vender code %.3d",
-                               bq2415x_chip_name[chip], revstr,
-                               bq2415x_get_vender_code(bq));
-       if (!bq->model) {
-               dev_err(bq->dev, "failed to allocate model name\n");
-               return -ENOMEM;
-       }
-
-       bq->charger = power_supply_register(bq->dev, &bq->charger_desc,
-                                           &psy_cfg);
-       if (IS_ERR(bq->charger)) {
-               kfree(bq->model);
-               return PTR_ERR(bq->charger);
-       }
-
-       return 0;
-}
-
 static void bq2415x_power_supply_exit(struct bq2415x_device *bq)
 {
        bq->autotimer = 0;
@@ -1496,7 +1448,7 @@ static DEVICE_ATTR(charge_status, S_IRUGO, bq2415x_sysfs_show_status, NULL);
 static DEVICE_ATTR(boost_status, S_IRUGO, bq2415x_sysfs_show_status, NULL);
 static DEVICE_ATTR(fault_status, S_IRUGO, bq2415x_sysfs_show_status, NULL);
 
-static struct attribute *bq2415x_sysfs_attributes[] = {
+static struct attribute *bq2415x_sysfs_attrs[] = {
        /*
         * TODO: some (appropriate) of these attrs should be switched to
         * use power supply class props.
@@ -1525,19 +1477,55 @@ static struct attribute *bq2415x_sysfs_attributes[] = {
        NULL,
 };
 
-static const struct attribute_group bq2415x_sysfs_attr_group = {
-       .attrs = bq2415x_sysfs_attributes,
-};
+ATTRIBUTE_GROUPS(bq2415x_sysfs);
 
-static int bq2415x_sysfs_init(struct bq2415x_device *bq)
+static int bq2415x_power_supply_init(struct bq2415x_device *bq)
 {
-       return sysfs_create_group(&bq->charger->dev.kobj,
-                       &bq2415x_sysfs_attr_group);
-}
+       int ret;
+       int chip;
+       char revstr[8];
+       struct power_supply_config psy_cfg = {
+               .drv_data = bq,
+               .of_node = bq->dev->of_node,
+               .attr_grp = bq2415x_sysfs_groups,
+       };
 
-static void bq2415x_sysfs_exit(struct bq2415x_device *bq)
-{
-       sysfs_remove_group(&bq->charger->dev.kobj, &bq2415x_sysfs_attr_group);
+       bq->charger_desc.name = bq->name;
+       bq->charger_desc.type = POWER_SUPPLY_TYPE_USB;
+       bq->charger_desc.properties = bq2415x_power_supply_props;
+       bq->charger_desc.num_properties =
+                       ARRAY_SIZE(bq2415x_power_supply_props);
+       bq->charger_desc.get_property = bq2415x_power_supply_get_property;
+
+       ret = bq2415x_detect_chip(bq);
+       if (ret < 0)
+               chip = BQUNKNOWN;
+       else
+               chip = ret;
+
+       ret = bq2415x_detect_revision(bq);
+       if (ret < 0)
+               strcpy(revstr, "unknown");
+       else
+               sprintf(revstr, "1.%d", ret);
+
+       bq->model = kasprintf(GFP_KERNEL,
+                               "chip %s, revision %s, vender code %.3d",
+                               bq2415x_chip_name[chip], revstr,
+                               bq2415x_get_vender_code(bq));
+       if (!bq->model) {
+               dev_err(bq->dev, "failed to allocate model name\n");
+               return -ENOMEM;
+       }
+
+       bq->charger = power_supply_register(bq->dev, &bq->charger_desc,
+                                           &psy_cfg);
+       if (IS_ERR(bq->charger)) {
+               kfree(bq->model);
+               return PTR_ERR(bq->charger);
+       }
+
+       return 0;
 }
 
 /* main bq2415x probe function */
@@ -1651,16 +1639,10 @@ static int bq2415x_probe(struct i2c_client *client,
                goto error_2;
        }
 
-       ret = bq2415x_sysfs_init(bq);
-       if (ret) {
-               dev_err(bq->dev, "failed to create sysfs entries: %d\n", ret);
-               goto error_3;
-       }
-
        ret = bq2415x_set_defaults(bq);
        if (ret) {
                dev_err(bq->dev, "failed to set default values: %d\n", ret);
-               goto error_4;
+               goto error_3;
        }
 
        if (bq->notify_node || bq->init_data.notify_device) {
@@ -1668,7 +1650,7 @@ static int bq2415x_probe(struct i2c_client *client,
                ret = power_supply_reg_notifier(&bq->nb);
                if (ret) {
                        dev_err(bq->dev, "failed to reg notifier: %d\n", ret);
-                       goto error_4;
+                       goto error_3;
                }
 
                bq->automode = 1;
@@ -1707,8 +1689,6 @@ static int bq2415x_probe(struct i2c_client *client,
        dev_info(bq->dev, "driver registered\n");
        return 0;
 
-error_4:
-       bq2415x_sysfs_exit(bq);
 error_3:
        bq2415x_power_supply_exit(bq);
 error_2:
@@ -1733,7 +1713,6 @@ static int bq2415x_remove(struct i2c_client *client)
                power_supply_unreg_notifier(&bq->nb);
 
        of_node_put(bq->notify_node);
-       bq2415x_sysfs_exit(bq);
        bq2415x_power_supply_exit(bq);
 
        bq2415x_reset_chip(bq);