iio: tsl2772: Use regulator_bulk_() APIs

Use regulator_bulk_() APIs to shrink driver size.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Reviewed-by: Brian Masney <masneyb@onstation.org>
Tested-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c
index 680afdb..be37fcb 100644 (file)
--- a/drivers/iio/light/tsl2772.c
+++ b/drivers/iio/light/tsl2772.c
@@ -134,6 +134,12 @@ enum {
        TSL2772_CHIP_SUSPENDED = 2
 };
 
+enum {
+       TSL2772_SUPPLY_VDD = 0,
+       TSL2772_SUPPLY_VDDIO = 1,
+       TSL2772_NUM_SUPPLIES = 2
+};
+
 /* Per-device data */
 struct tsl2772_als_info {
        u16 als_ch0;
@@ -161,8 +167,7 @@ struct tsl2772_chip {
        struct mutex prox_mutex;
        struct mutex als_mutex;
        struct i2c_client *client;
-       struct regulator *vdd_supply;
-       struct regulator *vddio_supply;
+       struct regulator_bulk_data supplies[TSL2772_NUM_SUPPLIES];
        u16 prox_data;
        struct tsl2772_als_info als_cur_info;
        struct tsl2772_settings settings;
@@ -697,46 +702,7 @@ static void tsl2772_disable_regulators_action(void *_data)
 {
        struct tsl2772_chip *chip = _data;
 
-       regulator_disable(chip->vdd_supply);
-       regulator_disable(chip->vddio_supply);
-}
-
-static int tsl2772_enable_regulator(struct tsl2772_chip *chip,
-                                   struct regulator *regulator)
-{
-       int ret;
-
-       ret = regulator_enable(regulator);
-       if (ret < 0) {
-               dev_err(&chip->client->dev, "Failed to enable regulator: %d\n",
-                       ret);
-               return ret;
-       }
-
-       return 0;
-}
-
-static struct regulator *tsl2772_get_regulator(struct tsl2772_chip *chip,
-                                              char *name)
-{
-       struct regulator *regulator;
-       int ret;
-
-       regulator = devm_regulator_get(&chip->client->dev, name);
-       if (IS_ERR(regulator)) {
-               if (PTR_ERR(regulator) != -EPROBE_DEFER)
-                       dev_err(&chip->client->dev,
-                               "Failed to get %s regulator %d\n",
-                               name, (int)PTR_ERR(regulator));
-
-               return regulator;
-       }
-
-       ret = tsl2772_enable_regulator(chip, regulator);
-       if (ret < 0)
-               return ERR_PTR(ret);
-
-       return regulator;
+       regulator_bulk_disable(ARRAY_SIZE(chip->supplies), chip->supplies);
 }
 
 static int tsl2772_chip_on(struct iio_dev *indio_dev)
@@ -1804,14 +1770,26 @@ static int tsl2772_probe(struct i2c_client *clientp,
        chip->client = clientp;
        i2c_set_clientdata(clientp, indio_dev);
 
-       chip->vddio_supply = tsl2772_get_regulator(chip, "vddio");
-       if (IS_ERR(chip->vddio_supply))
-               return PTR_ERR(chip->vddio_supply);
+       chip->supplies[TSL2772_SUPPLY_VDD].supply = "vdd";
+       chip->supplies[TSL2772_SUPPLY_VDDIO].supply = "vddio";
 
-       chip->vdd_supply = tsl2772_get_regulator(chip, "vdd");
-       if (IS_ERR(chip->vdd_supply)) {
-               regulator_disable(chip->vddio_supply);
-               return PTR_ERR(chip->vdd_supply);
+       ret = devm_regulator_bulk_get(&clientp->dev,
+                                     ARRAY_SIZE(chip->supplies),
+                                     chip->supplies);
+       if (ret < 0) {
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&clientp->dev,
+                               "Failed to get regulators: %d\n",
+                               ret);
+
+               return ret;
+       }
+
+       ret = regulator_bulk_enable(ARRAY_SIZE(chip->supplies), chip->supplies);
+       if (ret < 0) {
+               dev_err(&clientp->dev, "Failed to enable regulators: %d\n",
+                       ret);
+               return ret;
        }
 
        ret = devm_add_action_or_reset(&clientp->dev,
@@ -1900,8 +1878,7 @@ static int tsl2772_suspend(struct device *dev)
        int ret;
 
        ret = tsl2772_chip_off(indio_dev);
-       regulator_disable(chip->vdd_supply);
-       regulator_disable(chip->vddio_supply);
+       regulator_bulk_disable(ARRAY_SIZE(chip->supplies), chip->supplies);
 
        return ret;
 }
@@ -1912,16 +1889,10 @@ static int tsl2772_resume(struct device *dev)
        struct tsl2772_chip *chip = iio_priv(indio_dev);
        int ret;
 
-       ret = tsl2772_enable_regulator(chip, chip->vddio_supply);
+       ret = regulator_bulk_enable(ARRAY_SIZE(chip->supplies), chip->supplies);
        if (ret < 0)
                return ret;
 
-       ret = tsl2772_enable_regulator(chip, chip->vdd_supply);
-       if (ret < 0) {
-               regulator_disable(chip->vddio_supply);
-               return ret;
-       }
-
        usleep_range(TSL2772_BOOT_MIN_SLEEP_TIME, TSL2772_BOOT_MAX_SLEEP_TIME);
 
        return tsl2772_chip_on(indio_dev);