Re: [PATCH v3 3/9] iio: accel: bma400: conversion to device-managed function

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Apr 11, 2022 at 11:31 PM Jagath Jog J <jagathjog1996@xxxxxxxxx> wrote:
>
> This is a conversion to device-managed by using devm_iio_device_register

devm_iio_device_register()

> inside probe function. Previously the bma400 was not put into power down
> mode in some error paths in probe where it now is, but that should cause
> no harm.
>
> The dev_set_drvdata() call, bma400_remove() function and hooks in the I2C
> and SPI driver struct is removed as devm_iio_device_register function is

devm_iio_device_register()

> used to automatically unregister on driver detach.

LGTM,
Reviewed-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>

> Signed-off-by: Jagath Jog J <jagathjog1996@xxxxxxxxx>
> ---
>  drivers/iio/accel/bma400.h      |  2 -
>  drivers/iio/accel/bma400_core.c | 77 ++++++++++++++++-----------------
>  drivers/iio/accel/bma400_i2c.c  |  8 ----
>  drivers/iio/accel/bma400_spi.c  |  6 ---
>  4 files changed, 38 insertions(+), 55 deletions(-)
>
> diff --git a/drivers/iio/accel/bma400.h b/drivers/iio/accel/bma400.h
> index 5d6a1976503f..8dbf85eeb005 100644
> --- a/drivers/iio/accel/bma400.h
> +++ b/drivers/iio/accel/bma400.h
> @@ -113,6 +113,4 @@ extern const struct regmap_config bma400_regmap_config;
>
>  int bma400_probe(struct device *dev, struct regmap *regmap, const char *name);
>
> -void bma400_remove(struct device *dev);
> -
>  #endif
> diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_core.c
> index 25ad1f7339bc..07674d89d978 100644
> --- a/drivers/iio/accel/bma400_core.c
> +++ b/drivers/iio/accel/bma400_core.c
> @@ -560,6 +560,26 @@ static void bma400_init_tables(void)
>         }
>  }
>
> +static void bma400_regulators_disable(void *data_ptr)
> +{
> +       struct bma400_data *data = data_ptr;
> +
> +       regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators);
> +}
> +
> +static void bma400_power_disable(void *data_ptr)
> +{
> +       struct bma400_data *data = data_ptr;
> +       int ret;
> +
> +       mutex_lock(&data->mutex);
> +       ret = bma400_set_power_mode(data, POWER_MODE_SLEEP);
> +       mutex_unlock(&data->mutex);
> +       if (ret)
> +               dev_warn(data->dev, "Failed to put device into sleep mode (%pe)\n",
> +                        ERR_PTR(ret));
> +}
> +
>  static int bma400_init(struct bma400_data *data)
>  {
>         unsigned int val;
> @@ -569,13 +589,12 @@ static int bma400_init(struct bma400_data *data)
>         ret = regmap_read(data->regmap, BMA400_CHIP_ID_REG, &val);
>         if (ret) {
>                 dev_err(data->dev, "Failed to read chip id register\n");
> -               goto out;
> +               return ret;
>         }
>
>         if (val != BMA400_ID_REG_VAL) {
>                 dev_err(data->dev, "Chip ID mismatch\n");
> -               ret = -ENODEV;
> -               goto out;
> +               return -ENODEV;
>         }
>
>         data->regulators[BMA400_VDD_REGULATOR].supply = "vdd";
> @@ -589,27 +608,31 @@ static int bma400_init(struct bma400_data *data)
>                                 "Failed to get regulators: %d\n",
>                                 ret);
>
> -               goto out;
> +               return ret;
>         }
>         ret = regulator_bulk_enable(ARRAY_SIZE(data->regulators),
>                                     data->regulators);
>         if (ret) {
>                 dev_err(data->dev, "Failed to enable regulators: %d\n",
>                         ret);
> -               goto out;
> +               return ret;
>         }
>
> +       ret = devm_add_action_or_reset(data->dev, bma400_regulators_disable, data);
> +       if (ret)
> +               return ret;
> +
>         ret = bma400_get_power_mode(data);
>         if (ret) {
>                 dev_err(data->dev, "Failed to get the initial power-mode\n");
> -               goto err_reg_disable;
> +               return ret;
>         }
>
>         if (data->power_mode != POWER_MODE_NORMAL) {
>                 ret = bma400_set_power_mode(data, POWER_MODE_NORMAL);
>                 if (ret) {
>                         dev_err(data->dev, "Failed to wake up the device\n");
> -                       goto err_reg_disable;
> +                       return ret;
>                 }
>                 /*
>                  * TODO: The datasheet waits 1500us here in the example, but
> @@ -618,19 +641,23 @@ static int bma400_init(struct bma400_data *data)
>                 usleep_range(1500, 2000);
>         }
>
> +       ret = devm_add_action_or_reset(data->dev, bma400_power_disable, data);
> +       if (ret)
> +               return ret;
> +
>         bma400_init_tables();
>
>         ret = bma400_get_accel_output_data_rate(data);
>         if (ret)
> -               goto err_reg_disable;
> +               return ret;
>
>         ret = bma400_get_accel_oversampling_ratio(data);
>         if (ret)
> -               goto err_reg_disable;
> +               return ret;
>
>         ret = bma400_get_accel_scale(data);
>         if (ret)
> -               goto err_reg_disable;
> +               return ret;
>
>         /*
>          * Once the interrupt engine is supported we might use the
> @@ -639,12 +666,6 @@ static int bma400_init(struct bma400_data *data)
>          * channel.
>          */
>         return regmap_write(data->regmap, BMA400_ACC_CONFIG2_REG, 0x00);
> -
> -err_reg_disable:
> -       regulator_bulk_disable(ARRAY_SIZE(data->regulators),
> -                              data->regulators);
> -out:
> -       return ret;
>  }
>
>  static int bma400_read_raw(struct iio_dev *indio_dev,
> @@ -822,32 +843,10 @@ int bma400_probe(struct device *dev, struct regmap *regmap, const char *name)
>         indio_dev->num_channels = ARRAY_SIZE(bma400_channels);
>         indio_dev->modes = INDIO_DIRECT_MODE;
>
> -       dev_set_drvdata(dev, indio_dev);
> -
> -       return iio_device_register(indio_dev);
> +       return devm_iio_device_register(dev, indio_dev);
>  }
>  EXPORT_SYMBOL_NS(bma400_probe, IIO_BMA400);
>
> -void bma400_remove(struct device *dev)
> -{
> -       struct iio_dev *indio_dev = dev_get_drvdata(dev);
> -       struct bma400_data *data = iio_priv(indio_dev);
> -       int ret;
> -
> -       mutex_lock(&data->mutex);
> -       ret = bma400_set_power_mode(data, POWER_MODE_SLEEP);
> -       mutex_unlock(&data->mutex);
> -
> -       if (ret)
> -               dev_warn(dev, "Failed to put device into sleep mode (%pe)\n", ERR_PTR(ret));
> -
> -       regulator_bulk_disable(ARRAY_SIZE(data->regulators),
> -                              data->regulators);
> -
> -       iio_device_unregister(indio_dev);
> -}
> -EXPORT_SYMBOL_NS(bma400_remove, IIO_BMA400);
> -
>  MODULE_AUTHOR("Dan Robertson <dan@xxxxxxxxxxxxxxx>");
>  MODULE_DESCRIPTION("Bosch BMA400 triaxial acceleration sensor core");
>  MODULE_LICENSE("GPL");
> diff --git a/drivers/iio/accel/bma400_i2c.c b/drivers/iio/accel/bma400_i2c.c
> index da104ffd3fe0..4f6e01a3b3a1 100644
> --- a/drivers/iio/accel/bma400_i2c.c
> +++ b/drivers/iio/accel/bma400_i2c.c
> @@ -27,13 +27,6 @@ static int bma400_i2c_probe(struct i2c_client *client,
>         return bma400_probe(&client->dev, regmap, id->name);
>  }
>
> -static int bma400_i2c_remove(struct i2c_client *client)
> -{
> -       bma400_remove(&client->dev);
> -
> -       return 0;
> -}
> -
>  static const struct i2c_device_id bma400_i2c_ids[] = {
>         { "bma400", 0 },
>         { }
> @@ -52,7 +45,6 @@ static struct i2c_driver bma400_i2c_driver = {
>                 .of_match_table = bma400_of_i2c_match,
>         },
>         .probe    = bma400_i2c_probe,
> -       .remove   = bma400_i2c_remove,
>         .id_table = bma400_i2c_ids,
>  };
>
> diff --git a/drivers/iio/accel/bma400_spi.c b/drivers/iio/accel/bma400_spi.c
> index 51f23bdc0ea5..28e240400a3f 100644
> --- a/drivers/iio/accel/bma400_spi.c
> +++ b/drivers/iio/accel/bma400_spi.c
> @@ -87,11 +87,6 @@ static int bma400_spi_probe(struct spi_device *spi)
>         return bma400_probe(&spi->dev, regmap, id->name);
>  }
>
> -static void bma400_spi_remove(struct spi_device *spi)
> -{
> -       bma400_remove(&spi->dev);
> -}
> -
>  static const struct spi_device_id bma400_spi_ids[] = {
>         { "bma400", 0 },
>         { }
> @@ -110,7 +105,6 @@ static struct spi_driver bma400_spi_driver = {
>                 .of_match_table = bma400_of_spi_match,
>         },
>         .probe    = bma400_spi_probe,
> -       .remove   = bma400_spi_remove,
>         .id_table = bma400_spi_ids,
>  };
>
> --
> 2.17.1
>


-- 
With Best Regards,
Andy Shevchenko



[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux