]> git.karo-electronics.de Git - linux-beck.git/commitdiff
regulator: max1586: Remove regulator_dev pointer from state container
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Mon, 10 Mar 2014 08:32:44 +0000 (09:32 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 10 Mar 2014 09:22:51 +0000 (09:22 +0000)
Don't store pointer to regulator_dev returned by
devm_regulator_register() in state container. It isn't used anywhere
outside of max1586_pmic_probe() function.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
drivers/regulator/max1586.c

index e242dd316d363bb7f4226f2abfdee051c4d095d3..c2a40a1a9e3ed18f042ccbc5e51e078ecc22657c 100644 (file)
@@ -46,8 +46,6 @@ struct max1586_data {
 
        unsigned int v3_curr_sel;
        unsigned int v6_curr_sel;
-
-       struct regulator_dev *rdev[0];
 };
 
 /*
@@ -162,7 +160,6 @@ static struct regulator_desc max1586_reg[] = {
 static int max1586_pmic_probe(struct i2c_client *client,
                                        const struct i2c_device_id *i2c_id)
 {
-       struct regulator_dev **rdev;
        struct max1586_platform_data *pdata = dev_get_platdata(&client->dev);
        struct regulator_config config = { };
        struct max1586_data *max1586;
@@ -186,8 +183,9 @@ static int max1586_pmic_probe(struct i2c_client *client,
        max1586->v3_curr_sel = 24; /* 1.3V */
        max1586->v6_curr_sel = 0;
 
-       rdev = max1586->rdev;
        for (i = 0; i < pdata->num_subdevs && i <= MAX1586_V6; i++) {
+               struct regulator_dev *rdev;
+
                id = pdata->subdevs[i].id;
                if (!pdata->subdevs[i].platform_data)
                        continue;
@@ -207,12 +205,12 @@ static int max1586_pmic_probe(struct i2c_client *client,
                config.init_data = pdata->subdevs[i].platform_data;
                config.driver_data = max1586;
 
-               rdev[i] = devm_regulator_register(&client->dev,
+               rdev = devm_regulator_register(&client->dev,
                                                  &max1586_reg[id], &config);
-               if (IS_ERR(rdev[i])) {
+               if (IS_ERR(rdev)) {
                        dev_err(&client->dev, "failed to register %s\n",
                                max1586_reg[id].name);
-                       return PTR_ERR(rdev[i]);
+                       return PTR_ERR(rdev);
                }
        }