]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
regulator: max8649: Remove regulator_dev pointer from state container
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>
Mon, 10 Mar 2014 08:32:47 +0000 (09:32 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 10 Mar 2014 09:32:58 +0000 (09:32 +0000)
Don't store pointer to regulator_dev returned by
evm_regulator_register() an state container. It isn't used anywhere
outside of max8649_regulator_probe() function.

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

index 7f049c92ee52406bbbc7bd3e08573bdd89f25159..3172da847d248bfbb039162447d282ee99299abd 100644 (file)
@@ -49,7 +49,6 @@
 #define MAX8649_RAMP_DOWN      (1 << 1)
 
 struct max8649_regulator_info {
-       struct regulator_dev    *regulator;
        struct device           *dev;
        struct regmap           *regmap;
 
@@ -154,6 +153,7 @@ static int max8649_regulator_probe(struct i2c_client *client,
 {
        struct max8649_platform_data *pdata = dev_get_platdata(&client->dev);
        struct max8649_regulator_info *info = NULL;
+       struct regulator_dev *regulator;
        struct regulator_config config = { };
        unsigned int val;
        unsigned char data;
@@ -234,12 +234,12 @@ static int max8649_regulator_probe(struct i2c_client *client,
        config.driver_data = info;
        config.regmap = info->regmap;
 
-       info->regulator = devm_regulator_register(&client->dev, &dcdc_desc,
+       regulator = devm_regulator_register(&client->dev, &dcdc_desc,
                                                  &config);
-       if (IS_ERR(info->regulator)) {
+       if (IS_ERR(regulator)) {
                dev_err(info->dev, "failed to register regulator %s\n",
                        dcdc_desc.name);
-               return PTR_ERR(info->regulator);
+               return PTR_ERR(regulator);
        }
 
        return 0;