| Message ID | 20221016163409.320197-15-jic23@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | IIO: More devm_regulator[_bulk]_get_enable() users | expand |
On 10/16/22 19:34, Jonathan Cameron wrote: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > All the remaining calls in probe() have devm_ equivalents so > switching to those allows the remove() callbacks to be deleted. > No functional change. Right :) So please ignore my last comment in the patch 13/14 :) The one concerning the commit message is still valid though :) > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > Cc: Tomasz Duszynski <tduszyns@gmail.com> Reviewed-by: Matti Vaittinen <mazziesaccount@gmail.com> > --- > drivers/iio/pressure/ms5611.h | 1 - > drivers/iio/pressure/ms5611_core.c | 17 +++-------------- > drivers/iio/pressure/ms5611_i2c.c | 6 ------ > drivers/iio/pressure/ms5611_spi.c | 6 ------ > 4 files changed, 3 insertions(+), 27 deletions(-) >
On Mon, 17 Oct 2022 09:30:01 +0300 Matti Vaittinen <mazziesaccount@gmail.com> wrote: > On 10/16/22 19:34, Jonathan Cameron wrote: > > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > > > All the remaining calls in probe() have devm_ equivalents so > > switching to those allows the remove() callbacks to be deleted. > > No functional change. > > Right :) So please ignore my last comment in the patch 13/14 :) The one > concerning the commit message is still valid though :) > > > > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > Cc: Tomasz Duszynski <tduszyns@gmail.com> > > Reviewed-by: Matti Vaittinen <mazziesaccount@gmail.com> Applied to the togreg branch of iio.git - some fuzz due to crossing with i2c probe_new() mass conversion and the changes that affected the previous patch. If anyone wants to sanity check the result, see the testing branch of iio.git in a few minutes. Thanks, Jonathan > > > --- > > drivers/iio/pressure/ms5611.h | 1 - > > drivers/iio/pressure/ms5611_core.c | 17 +++-------------- > > drivers/iio/pressure/ms5611_i2c.c | 6 ------ > > drivers/iio/pressure/ms5611_spi.c | 6 ------ > > 4 files changed, 3 insertions(+), 27 deletions(-) > > >
diff --git a/drivers/iio/pressure/ms5611.h b/drivers/iio/pressure/ms5611.h index 816e83befd23..f7066315fde3 100644 --- a/drivers/iio/pressure/ms5611.h +++ b/drivers/iio/pressure/ms5611.h @@ -58,6 +58,5 @@ struct ms5611_state { int ms5611_probe(struct iio_dev *indio_dev, struct device *dev, const char *name, int type); -void ms5611_remove(struct iio_dev *indio_dev); #endif /* _MS5611_H */ diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c index b95ee6034548..75a98470dcea 100644 --- a/drivers/iio/pressure/ms5611_core.c +++ b/drivers/iio/pressure/ms5611_core.c @@ -431,34 +431,23 @@ int ms5611_probe(struct iio_dev *indio_dev, struct device *dev, if (ret < 0) return ret; - ret = iio_triggered_buffer_setup(indio_dev, NULL, + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, ms5611_trigger_handler, NULL); if (ret < 0) { dev_err(dev, "iio triggered buffer setup failed\n"); return ret; } - ret = iio_device_register(indio_dev); + ret = devm_iio_device_register(dev, indio_dev); if (ret < 0) { dev_err(dev, "unable to register iio device\n"); - goto err_buffer_cleanup; + return ret; } return 0; - -err_buffer_cleanup: - iio_triggered_buffer_cleanup(indio_dev); - return ret; } EXPORT_SYMBOL_NS(ms5611_probe, IIO_MS5611); -void ms5611_remove(struct iio_dev *indio_dev) -{ - iio_device_unregister(indio_dev); - iio_triggered_buffer_cleanup(indio_dev); -} -EXPORT_SYMBOL_NS(ms5611_remove, IIO_MS5611); - MODULE_AUTHOR("Tomasz Duszynski <tduszyns@gmail.com>"); MODULE_DESCRIPTION("MS5611 core driver"); MODULE_LICENSE("GPL v2"); diff --git a/drivers/iio/pressure/ms5611_i2c.c b/drivers/iio/pressure/ms5611_i2c.c index b681a4183909..2bab509a8c1d 100644 --- a/drivers/iio/pressure/ms5611_i2c.c +++ b/drivers/iio/pressure/ms5611_i2c.c @@ -105,11 +105,6 @@ static int ms5611_i2c_probe(struct i2c_client *client, return ms5611_probe(indio_dev, &client->dev, id->name, id->driver_data); } -static void ms5611_i2c_remove(struct i2c_client *client) -{ - ms5611_remove(i2c_get_clientdata(client)); -} - static const struct of_device_id ms5611_i2c_matches[] = { { .compatible = "meas,ms5611" }, { .compatible = "meas,ms5607" }, @@ -131,7 +126,6 @@ static struct i2c_driver ms5611_driver = { }, .id_table = ms5611_id, .probe = ms5611_i2c_probe, - .remove = ms5611_i2c_remove, }; module_i2c_driver(ms5611_driver); diff --git a/drivers/iio/pressure/ms5611_spi.c b/drivers/iio/pressure/ms5611_spi.c index 432e912096f4..f0f5b46d8f9c 100644 --- a/drivers/iio/pressure/ms5611_spi.c +++ b/drivers/iio/pressure/ms5611_spi.c @@ -107,11 +107,6 @@ static int ms5611_spi_probe(struct spi_device *spi) spi_get_device_id(spi)->driver_data); } -static void ms5611_spi_remove(struct spi_device *spi) -{ - ms5611_remove(spi_get_drvdata(spi)); -} - static const struct of_device_id ms5611_spi_matches[] = { { .compatible = "meas,ms5611" }, { .compatible = "meas,ms5607" }, @@ -133,7 +128,6 @@ static struct spi_driver ms5611_driver = { }, .id_table = ms5611_id, .probe = ms5611_spi_probe, - .remove = ms5611_spi_remove, }; module_spi_driver(ms5611_driver);