| Message ID | 20210808122335.4895-1-theobf@usp.br (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | iio: pressure: hp03: update device probe to register with devm functions | expand |
On Sun, 8 Aug 2021 09:23:36 -0300 Théo Borém Fabris <theobf@usp.br> wrote: > Update device probe to register resources with device-managed functions. > Further, get rid of device-specific remove callback which is no longer > needed. > > Signed-off-by: Théo Borém Fabris <theobf@usp.br> +Cc Marek on a couple of addresses as not sure which currently work. One tiny cleanup inline, otherwise looks good to me. > --- > Could the dev_err() messages be improved? In particular, I don't know if > it is important to express the usage of the device-managed functions. I'd leave them as is. Chance of a devm causing a failure that wouldn't otherwise happen is nearly 0 as it only requires a tiny allocation extra. > > drivers/iio/pressure/hp03.c | 35 +++++++---------------------------- > 1 file changed, 7 insertions(+), 28 deletions(-) > > diff --git a/drivers/iio/pressure/hp03.c b/drivers/iio/pressure/hp03.c > index e40b1d7dc12..78ea95d9f99 100644 > --- a/drivers/iio/pressure/hp03.c > +++ b/drivers/iio/pressure/hp03.c > @@ -242,47 +242,27 @@ static int hp03_probe(struct i2c_client *client, > * which has it's dedicated I2C address and contains > * the calibration constants for the sensor. > */ > - priv->eeprom_client = i2c_new_dummy_device(client->adapter, HP03_EEPROM_ADDR); > + priv->eeprom_client = devm_i2c_new_dummy_device(dev, client->adapter, > + HP03_EEPROM_ADDR); > if (IS_ERR(priv->eeprom_client)) { > dev_err(dev, "New EEPROM I2C device failed\n"); > return PTR_ERR(priv->eeprom_client); > } > > - priv->eeprom_regmap = regmap_init_i2c(priv->eeprom_client, > - &hp03_regmap_config); > + priv->eeprom_regmap = devm_regmap_init_i2c(priv->eeprom_client, > + &hp03_regmap_config); > if (IS_ERR(priv->eeprom_regmap)) { > dev_err(dev, "Failed to allocate EEPROM regmap\n"); > ret = PTR_ERR(priv->eeprom_regmap); > - goto err_cleanup_eeprom_client; > + return ret; return PTR_ERR(priv->eeprom_regmap); > } > > - ret = iio_device_register(indio_dev); > + ret = devm_iio_device_register(dev, indio_dev); > if (ret) { > dev_err(dev, "Failed to register IIO device\n"); > - goto err_cleanup_eeprom_regmap; > + return ret; > } > > - i2c_set_clientdata(client, indio_dev); > - > - return 0; > - > -err_cleanup_eeprom_regmap: > - regmap_exit(priv->eeprom_regmap); > - > -err_cleanup_eeprom_client: > - i2c_unregister_device(priv->eeprom_client); > - return ret; > -} > - > -static int hp03_remove(struct i2c_client *client) > -{ > - struct iio_dev *indio_dev = i2c_get_clientdata(client); > - struct hp03_priv *priv = iio_priv(indio_dev); > - > - iio_device_unregister(indio_dev); > - regmap_exit(priv->eeprom_regmap); > - i2c_unregister_device(priv->eeprom_client); > - > return 0; > } > > @@ -304,7 +284,6 @@ static struct i2c_driver hp03_driver = { > .of_match_table = hp03_of_match, > }, > .probe = hp03_probe, > - .remove = hp03_remove, > .id_table = hp03_id, > }; > module_i2c_driver(hp03_driver);
diff --git a/drivers/iio/pressure/hp03.c b/drivers/iio/pressure/hp03.c index e40b1d7dc12..78ea95d9f99 100644 --- a/drivers/iio/pressure/hp03.c +++ b/drivers/iio/pressure/hp03.c @@ -242,47 +242,27 @@ static int hp03_probe(struct i2c_client *client, * which has it's dedicated I2C address and contains * the calibration constants for the sensor. */ - priv->eeprom_client = i2c_new_dummy_device(client->adapter, HP03_EEPROM_ADDR); + priv->eeprom_client = devm_i2c_new_dummy_device(dev, client->adapter, + HP03_EEPROM_ADDR); if (IS_ERR(priv->eeprom_client)) { dev_err(dev, "New EEPROM I2C device failed\n"); return PTR_ERR(priv->eeprom_client); } - priv->eeprom_regmap = regmap_init_i2c(priv->eeprom_client, - &hp03_regmap_config); + priv->eeprom_regmap = devm_regmap_init_i2c(priv->eeprom_client, + &hp03_regmap_config); if (IS_ERR(priv->eeprom_regmap)) { dev_err(dev, "Failed to allocate EEPROM regmap\n"); ret = PTR_ERR(priv->eeprom_regmap); - goto err_cleanup_eeprom_client; + return ret; } - ret = iio_device_register(indio_dev); + ret = devm_iio_device_register(dev, indio_dev); if (ret) { dev_err(dev, "Failed to register IIO device\n"); - goto err_cleanup_eeprom_regmap; + return ret; } - i2c_set_clientdata(client, indio_dev); - - return 0; - -err_cleanup_eeprom_regmap: - regmap_exit(priv->eeprom_regmap); - -err_cleanup_eeprom_client: - i2c_unregister_device(priv->eeprom_client); - return ret; -} - -static int hp03_remove(struct i2c_client *client) -{ - struct iio_dev *indio_dev = i2c_get_clientdata(client); - struct hp03_priv *priv = iio_priv(indio_dev); - - iio_device_unregister(indio_dev); - regmap_exit(priv->eeprom_regmap); - i2c_unregister_device(priv->eeprom_client); - return 0; } @@ -304,7 +284,6 @@ static struct i2c_driver hp03_driver = { .of_match_table = hp03_of_match, }, .probe = hp03_probe, - .remove = hp03_remove, .id_table = hp03_id, }; module_i2c_driver(hp03_driver);
Update device probe to register resources with device-managed functions. Further, get rid of device-specific remove callback which is no longer needed. Signed-off-by: Théo Borém Fabris <theobf@usp.br> --- Could the dev_err() messages be improved? In particular, I don't know if it is important to express the usage of the device-managed functions. drivers/iio/pressure/hp03.c | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-)