]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
power: supply: charger-manager: simplify generation of sysfs attribute group name
authorSebastian Reichel <sebastian.reichel@collabora.com>
Fri, 28 Sep 2018 13:14:22 +0000 (15:14 +0200)
committerSebastian Reichel <sre@kernel.org>
Wed, 12 Dec 2018 23:16:16 +0000 (00:16 +0100)
This is a simple cleanup and there should be no functional changes.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/charger-manager.c

index dc0c9a6c7d2171bf054e5563062311204d7eeba7..2e579da5c0b99b00d39c28df156a0635e2a63f27 100644 (file)
@@ -1368,8 +1368,7 @@ static int charger_manager_register_sysfs(struct charger_manager *cm)
        struct charger_desc *desc = cm->desc;
        struct charger_regulator *charger;
        int chargers_externally_control = 1;
-       char buf[11];
-       char *str;
+       char *name;
        int ret;
        int i;
 
@@ -1377,19 +1376,15 @@ static int charger_manager_register_sysfs(struct charger_manager *cm)
        for (i = 0; i < desc->num_charger_regulators; i++) {
                charger = &desc->charger_regulators[i];
 
-               snprintf(buf, 10, "charger.%d", i);
-               str = devm_kzalloc(cm->dev,
-                               strlen(buf) + 1, GFP_KERNEL);
-               if (!str)
+               name = devm_kasprintf(cm->dev, GFP_KERNEL, "charger.%d", i);
+               if (!name)
                        return -ENOMEM;
 
-               strcpy(str, buf);
-
                charger->attrs[0] = &charger->attr_name.attr;
                charger->attrs[1] = &charger->attr_state.attr;
                charger->attrs[2] = &charger->attr_externally_control.attr;
                charger->attrs[3] = NULL;
-               charger->attr_g.name = str;
+               charger->attr_g.name = name;
                charger->attr_g.attrs = charger->attrs;
 
                sysfs_attr_init(&charger->attr_name.attr);