Merge tag 'xfs-5.1-merge-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-block.git] / drivers / regulator / isl6271a-regulator.c

diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c
index 4abd8e9c81e5893b4a84d3146db7131c8f42387a..6f28bba81d13cc44e0a96ae687b5693fd6e6cdc8 100644 (file)
--- a/drivers/regulator/isl6271a-regulator.c
+++ b/drivers/regulator/isl6271a-regulator.c
@@ -31,7 +31,6 @@
 /* PMIC details */
 struct isl_pmic {
        struct i2c_client       *client;
-       struct regulator_dev    *rdev[3];
        struct mutex            mtx;
 };
 
@@ -66,14 +65,14 @@ static int isl6271a_set_voltage_sel(struct regulator_dev *dev,
        return err;
 }
 
-static struct regulator_ops isl_core_ops = {
+static const struct regulator_ops isl_core_ops = {
        .get_voltage_sel = isl6271a_get_voltage_sel,
        .set_voltage_sel = isl6271a_set_voltage_sel,
        .list_voltage   = regulator_list_voltage_linear,
        .map_voltage    = regulator_map_voltage_linear,
 };
 
-static struct regulator_ops isl_fixed_ops = {
+static const struct regulator_ops isl_fixed_ops = {
        .list_voltage   = regulator_list_voltage_linear,
 };
 
@@ -109,6 +108,7 @@ static const struct regulator_desc isl_rd[] = {
 static int isl6271a_probe(struct i2c_client *i2c,
                                     const struct i2c_device_id *id)
 {
+       struct regulator_dev *rdev;
        struct regulator_config config = { };
        struct regulator_init_data *init_data   = dev_get_platdata(&i2c->dev);
        struct isl_pmic *pmic;
@@ -133,11 +133,10 @@ static int isl6271a_probe(struct i2c_client *i2c,
                        config.init_data = NULL;
                config.driver_data = pmic;
 
-               pmic->rdev[i] = devm_regulator_register(&i2c->dev, &isl_rd[i],
-                                                       &config);
-               if (IS_ERR(pmic->rdev[i])) {
+               rdev = devm_regulator_register(&i2c->dev, &isl_rd[i], &config);
+               if (IS_ERR(rdev)) {
                        dev_err(&i2c->dev, "failed to register %s\n", id->name);
-                       return PTR_ERR(pmic->rdev[i]);
+                       return PTR_ERR(rdev);
                }
        }