sbs-battery: Change power supply name

The power supply name used to be fixed as "battery". This change allows
for multiple batteries by generating the name rather than using a fixed
value.

Signed-off-by: Rhyland Klein <rklein@nvidia.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
index 00bd9e079e803127f7a022f9c9a308e224f7cf2d..b677b88da00f7dc89118b87201ca1af6d53768fb 100644 (file)
--- a/drivers/power/sbs-battery.c
+++ b/drivers/power/sbs-battery.c
@@ -682,15 +682,24 @@ static int __devinit sbs_probe(struct i2c_client *client,
        struct sbs_platform_data *pdata = client->dev.platform_data;
        int rc;
        int irq;
+       char *name;
 
-       chip = kzalloc(sizeof(struct sbs_info), GFP_KERNEL);
-       if (!chip)
+       name = kasprintf(GFP_KERNEL, "sbs-%s", dev_name(&client->dev));
+       if (!name) {
+               dev_err(&client->dev, "Failed to allocate device name\n");
                return -ENOMEM;
+       }
+
+       chip = kzalloc(sizeof(struct sbs_info), GFP_KERNEL);
+       if (!chip) {
+               rc = -ENOMEM;
+               goto exit_free_name;
+       }
 
        chip->client = client;
        chip->enable_detection = false;
        chip->gpio_detect = false;
-       chip->power_supply.name = "battery";
+       chip->power_supply.name = name;
        chip->power_supply.type = POWER_SUPPLY_TYPE_BATTERY;
        chip->power_supply.properties = sbs_properties;
        chip->power_supply.num_properties = ARRAY_SIZE(sbs_properties);
@@ -775,6 +784,9 @@ exit_psupply:
 
        kfree(chip);
 
+exit_free_name:
+       kfree(name);
+
        return rc;
 }
 
@@ -791,6 +803,7 @@ static int __devexit sbs_remove(struct i2c_client *client)
 
        cancel_delayed_work_sync(&chip->work);
 
+       kfree(chip->power_supply.name);
        kfree(chip);
        chip = NULL;