lkml.org 
[lkml]   [2022]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v2 7/7] iio: Simplify drivers using devm_regulator_*get_enable()
    adc/ad7192:
    Use devm_regulator_get_enable() instead of open coded get, enable,
    add-action-to-disable-at-detach - pattern. Also drop the seemingly unused
    struct member 'dvdd'.

    dac/ltc2688:
    gyro/bmg160_core:
    Use devm_regulator_bulk_get_enable() instead of open coded bulk-get,
    bulk-enable, add-action-to-disable-at-detach - pattern.

    imu/st_lsm6dsx:
    Use devm_regulator_bulk_get_enable() instead of open coded bulk-get,
    bulk-enable, add-action-to-disable-at-detach - pattern.

    A functional change (which seems like a bugfix) is that if
    regulator_bulk_get fails, the enable is not attempted.

    Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>

    ---
    RFCv1 => v2:
    Squashed all IIO changes to one patch. Added use of
    devm_regulator_bulk_get_enable().

    Please note - this is only compile-tested due to the lack of HW. Careful
    review and testing is _highly_ appreciated.
    ---
    drivers/iio/adc/ad7192.c | 15 ++--------
    drivers/iio/dac/ltc2688.c | 23 ++-------------
    drivers/iio/gyro/bmg160_core.c | 24 ++--------------
    drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 --
    drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 30 ++++----------------
    5 files changed, 13 insertions(+), 81 deletions(-)

    diff --git a/drivers/iio/adc/ad7192.c b/drivers/iio/adc/ad7192.c
    index d71977be7d22..8a52c0dec3f9 100644
    --- a/drivers/iio/adc/ad7192.c
    +++ b/drivers/iio/adc/ad7192.c
    @@ -177,7 +177,6 @@ struct ad7192_chip_info {
    struct ad7192_state {
    const struct ad7192_chip_info *chip_info;
    struct regulator *avdd;
    - struct regulator *dvdd;
    struct clk *mclk;
    u16 int_vref_mv;
    u32 fclk;
    @@ -1015,19 +1014,9 @@ static int ad7192_probe(struct spi_device *spi)
    if (ret)
    return ret;

    - st->dvdd = devm_regulator_get(&spi->dev, "dvdd");
    - if (IS_ERR(st->dvdd))
    - return PTR_ERR(st->dvdd);
    -
    - ret = regulator_enable(st->dvdd);
    - if (ret) {
    - dev_err(&spi->dev, "Failed to enable specified DVdd supply\n");
    - return ret;
    - }
    -
    - ret = devm_add_action_or_reset(&spi->dev, ad7192_reg_disable, st->dvdd);
    + ret = devm_regulator_get_enable(&spi->dev, "dvdd");
    if (ret)
    - return ret;
    + return dev_err_probe(&spi->dev, ret, "Failed to enable specified DVdd supply\n");

    ret = regulator_get_voltage(st->avdd);
    if (ret < 0) {
    diff --git a/drivers/iio/dac/ltc2688.c b/drivers/iio/dac/ltc2688.c
    index 937b0d25a11c..1abc88cd99f9 100644
    --- a/drivers/iio/dac/ltc2688.c
    +++ b/drivers/iio/dac/ltc2688.c
    @@ -84,7 +84,6 @@ struct ltc2688_chan {
    struct ltc2688_state {
    struct spi_device *spi;
    struct regmap *regmap;
    - struct regulator_bulk_data regulators[2];
    struct ltc2688_chan channels[LTC2688_DAC_CHANNELS];
    struct iio_chan_spec *iio_chan;
    /* lock to protect against multiple access to the device and shared data */
    @@ -902,13 +901,6 @@ static int ltc2688_setup(struct ltc2688_state *st, struct regulator *vref)
    LTC2688_CONFIG_EXT_REF);
    }

    -static void ltc2688_disable_regulators(void *data)
    -{
    - struct ltc2688_state *st = data;
    -
    - regulator_bulk_disable(ARRAY_SIZE(st->regulators), st->regulators);
    -}
    -
    static void ltc2688_disable_regulator(void *regulator)
    {
    regulator_disable(regulator);
    @@ -970,6 +962,7 @@ static int ltc2688_probe(struct spi_device *spi)
    struct regulator *vref_reg;
    struct device *dev = &spi->dev;
    int ret;
    + static const char * const regulators[] = {"vcc", "iovcc"};

    indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
    if (!indio_dev)
    @@ -988,21 +981,11 @@ static int ltc2688_probe(struct spi_device *spi)
    return dev_err_probe(dev, PTR_ERR(st->regmap),
    "Failed to init regmap");

    - st->regulators[0].supply = "vcc";
    - st->regulators[1].supply = "iovcc";
    - ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(st->regulators),
    - st->regulators);
    - if (ret)
    - return dev_err_probe(dev, ret, "Failed to get regulators\n");
    -
    - ret = regulator_bulk_enable(ARRAY_SIZE(st->regulators), st->regulators);
    + ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators),
    + regulators);
    if (ret)
    return dev_err_probe(dev, ret, "Failed to enable regulators\n");

    - ret = devm_add_action_or_reset(dev, ltc2688_disable_regulators, st);
    - if (ret)
    - return ret;
    -
    vref_reg = devm_regulator_get_optional(dev, "vref");
    if (IS_ERR(vref_reg)) {
    if (PTR_ERR(vref_reg) != -ENODEV)
    diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c
    index 81a6d09788bd..acfabac645b6 100644
    --- a/drivers/iio/gyro/bmg160_core.c
    +++ b/drivers/iio/gyro/bmg160_core.c
    @@ -93,7 +93,6 @@

    struct bmg160_data {
    struct regmap *regmap;
    - struct regulator_bulk_data regulators[2];
    struct iio_trigger *dready_trig;
    struct iio_trigger *motion_trig;
    struct iio_mount_matrix orientation;
    @@ -1067,19 +1066,13 @@ static const char *bmg160_match_acpi_device(struct device *dev)
    return dev_name(dev);
    }

    -static void bmg160_disable_regulators(void *d)
    -{
    - struct bmg160_data *data = d;
    -
    - regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators);
    -}
    -
    int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,
    const char *name)
    {
    struct bmg160_data *data;
    struct iio_dev *indio_dev;
    int ret;
    + static const char * const regulators[] = {"vdd", "vddio"};

    indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
    if (!indio_dev)
    @@ -1090,22 +1083,11 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,
    data->irq = irq;
    data->regmap = regmap;

    - data->regulators[0].supply = "vdd";
    - data->regulators[1].supply = "vddio";
    - ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(data->regulators),
    - data->regulators);
    + ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators),
    + regulators);
    if (ret)
    return dev_err_probe(dev, ret, "Failed to get regulators\n");

    - ret = regulator_bulk_enable(ARRAY_SIZE(data->regulators),
    - data->regulators);
    - if (ret)
    - return ret;
    -
    - ret = devm_add_action_or_reset(dev, bmg160_disable_regulators, data);
    - if (ret)
    - return ret;
    -
    ret = iio_read_mount_matrix(dev, &data->orientation);
    if (ret)
    return ret;
    diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
    index a86dd29a4738..03238c64c777 100644
    --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
    +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
    @@ -372,7 +372,6 @@ struct st_lsm6dsx_sensor {
    * struct st_lsm6dsx_hw - ST IMU MEMS hw instance
    * @dev: Pointer to instance of struct device (I2C or SPI).
    * @regmap: Register map of the device.
    - * @regulators: VDD/VDDIO voltage regulators.
    * @irq: Device interrupt line (I2C or SPI).
    * @fifo_lock: Mutex to prevent concurrent access to the hw FIFO.
    * @conf_lock: Mutex to prevent concurrent FIFO configuration update.
    @@ -395,7 +394,6 @@ struct st_lsm6dsx_sensor {
    struct st_lsm6dsx_hw {
    struct device *dev;
    struct regmap *regmap;
    - struct regulator_bulk_data regulators[2];
    int irq;

    struct mutex fifo_lock;
    diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
    index 910397716833..7b40f6b58834 100644
    --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
    +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
    @@ -2172,36 +2172,20 @@ static int st_lsm6dsx_irq_setup(struct st_lsm6dsx_hw *hw)

    static int st_lsm6dsx_init_regulators(struct device *dev)
    {
    - struct st_lsm6dsx_hw *hw = dev_get_drvdata(dev);
    int err;
    -
    /* vdd-vddio power regulators */
    - hw->regulators[0].supply = "vdd";
    - hw->regulators[1].supply = "vddio";
    - err = devm_regulator_bulk_get(dev, ARRAY_SIZE(hw->regulators),
    - hw->regulators);
    - if (err)
    - return dev_err_probe(dev, err, "failed to get regulators\n");
    + static const char * const regulators[] = {"vdd", "vddio"};

    - err = regulator_bulk_enable(ARRAY_SIZE(hw->regulators),
    - hw->regulators);
    - if (err) {
    - dev_err(dev, "failed to enable regulators: %d\n", err);
    - return err;
    - }
    + err = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(regulators),
    + regulators);
    + if (err)
    + return dev_err_probe(dev, err, "failed to enable regulators\n");

    msleep(50);

    return 0;
    }

    -static void st_lsm6dsx_chip_uninit(void *data)
    -{
    - struct st_lsm6dsx_hw *hw = data;
    -
    - regulator_bulk_disable(ARRAY_SIZE(hw->regulators), hw->regulators);
    -}
    -
    int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
    struct regmap *regmap)
    {
    @@ -2225,10 +2209,6 @@ int st_lsm6dsx_probe(struct device *dev, int irq, int hw_id,
    if (err)
    return err;

    - err = devm_add_action_or_reset(dev, st_lsm6dsx_chip_uninit, hw);
    - if (err)
    - return err;
    -
    hw->buff = devm_kzalloc(dev, ST_LSM6DSX_BUFF_SIZE, GFP_KERNEL);
    if (!hw->buff)
    return -ENOMEM;
    --
    2.37.1

    --
    Matti Vaittinen, Linux device drivers
    ROHM Semiconductors, Finland SWDC
    Kiviharjunlenkki 1E
    90220 OULU
    FINLAND

    ~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
    Simon says - in Latin please.
    ~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
    Thanks to Simon Glass for the translation =]
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2022-08-12 12:13    [W:4.184 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site