Commit ffc6659b authored by Théo Borém Fabris's avatar Théo Borém Fabris Committed by Jonathan Cameron

iio: pressure: hp03: update device probe to register with devm functions

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: default avatarThéo Borém Fabris <theobf@usp.br>
Link: https://lore.kernel.org/r/20210809203014.10955-1-theobf@usp.brSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent cabd6e9c
...@@ -242,47 +242,26 @@ static int hp03_probe(struct i2c_client *client, ...@@ -242,47 +242,26 @@ static int hp03_probe(struct i2c_client *client,
* which has it's dedicated I2C address and contains * which has it's dedicated I2C address and contains
* the calibration constants for the sensor. * 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)) { if (IS_ERR(priv->eeprom_client)) {
dev_err(dev, "New EEPROM I2C device failed\n"); dev_err(dev, "New EEPROM I2C device failed\n");
return PTR_ERR(priv->eeprom_client); return PTR_ERR(priv->eeprom_client);
} }
priv->eeprom_regmap = regmap_init_i2c(priv->eeprom_client, priv->eeprom_regmap = devm_regmap_init_i2c(priv->eeprom_client,
&hp03_regmap_config); &hp03_regmap_config);
if (IS_ERR(priv->eeprom_regmap)) { if (IS_ERR(priv->eeprom_regmap)) {
dev_err(dev, "Failed to allocate EEPROM regmap\n"); dev_err(dev, "Failed to allocate EEPROM regmap\n");
ret = PTR_ERR(priv->eeprom_regmap); return PTR_ERR(priv->eeprom_regmap);
goto err_cleanup_eeprom_client;
} }
ret = iio_device_register(indio_dev); ret = devm_iio_device_register(dev, indio_dev);
if (ret) { if (ret) {
dev_err(dev, "Failed to register IIO device\n"); 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; return 0;
} }
...@@ -304,7 +283,6 @@ static struct i2c_driver hp03_driver = { ...@@ -304,7 +283,6 @@ static struct i2c_driver hp03_driver = {
.of_match_table = hp03_of_match, .of_match_table = hp03_of_match,
}, },
.probe = hp03_probe, .probe = hp03_probe,
.remove = hp03_remove,
.id_table = hp03_id, .id_table = hp03_id,
}; };
module_i2c_driver(hp03_driver); module_i2c_driver(hp03_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment