Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / drivers / regulator / hi655x-regulator.c

diff --git a/drivers/regulator/hi655x-regulator.c b/drivers/regulator/hi655x-regulator.c
index 68cdb17..556bb73 100644 (file)
--- a/drivers/regulator/hi655x-regulator.c
+++ b/drivers/regulator/hi655x-regulator.c
@@ -72,7 +72,7 @@ enum hi655x_regulator_id {
 static int hi655x_is_enabled(struct regulator_dev *rdev)
 {
        unsigned int value = 0;
-       struct hi655x_regulator *regulator = rdev_get_drvdata(rdev);
+       const struct hi655x_regulator *regulator = rdev_get_drvdata(rdev);
 
        regmap_read(rdev->regmap, regulator->status_reg, &value);
        return (value & rdev->desc->enable_mask);
@@ -80,7 +80,7 @@ static int hi655x_is_enabled(struct regulator_dev *rdev)
 
 static int hi655x_disable(struct regulator_dev *rdev)
 {
-       struct hi655x_regulator *regulator = rdev_get_drvdata(rdev);
+       const struct hi655x_regulator *regulator = rdev_get_drvdata(rdev);
 
        return regmap_write(rdev->regmap, regulator->disable_reg,
                            rdev->desc->enable_mask);
@@ -169,7 +169,6 @@ static const struct hi655x_regulator regulators[] = {
 static int hi655x_regulator_probe(struct platform_device *pdev)
 {
        unsigned int i;
-       struct hi655x_regulator *regulator;
        struct hi655x_pmic *pmic;
        struct regulator_config config = { };
        struct regulator_dev *rdev;
@@ -180,22 +179,17 @@ static int hi655x_regulator_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       regulator = devm_kzalloc(&pdev->dev, sizeof(*regulator), GFP_KERNEL);
-       if (!regulator)
-               return -ENOMEM;
-
-       platform_set_drvdata(pdev, regulator);
-
        config.dev = pdev->dev.parent;
        config.regmap = pmic->regmap;
-       config.driver_data = regulator;
        for (i = 0; i < ARRAY_SIZE(regulators); i++) {
+               config.driver_data = (void *) &regulators[i];
+
                rdev = devm_regulator_register(&pdev->dev,
                                               &regulators[i].rdesc,
                                               &config);
                if (IS_ERR(rdev)) {
                        dev_err(&pdev->dev, "failed to register regulator %s\n",
-                               regulator->rdesc.name);
+                               regulators[i].rdesc.name);
                        return PTR_ERR(rdev);
                }
        }