diff options
| author | Enric Balletbo i Serra <enric.balletbo@collabora.com> | 2017-03-24 18:44:03 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2017-03-25 15:08:29 +0000 |
| commit | 754434c445dafe79d55304a698c231ecbcc046d7 (patch) | |
| tree | 5dfc4e120f326e5a4b5d8297e3bad76218245067 /drivers/iio/common | |
| parent | 48ba7c3c0b37363d9ddca3354ca503ad721e14dc (diff) | |
| download | linux-stable-754434c445dafe79d55304a698c231ecbcc046d7.tar.gz linux-stable-754434c445dafe79d55304a698c231ecbcc046d7.tar.bz2 linux-stable-754434c445dafe79d55304a698c231ecbcc046d7.zip | |
iio: cros_ec_sensors: Use devm to setup the triggered buffer.
Use resourced managed function devm_iio_triggered_buffer_setup
to make error path simpler and be able to get rid of the remove
function.
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/common')
| -rw-r--r-- | drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c index d6c372bb433b..cbf6288ad174 100644 --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c @@ -267,31 +267,12 @@ static int cros_ec_sensors_probe(struct platform_device *pdev) else state->core.read_ec_sensors_data = cros_ec_sensors_read_cmd; - ret = iio_triggered_buffer_setup(indio_dev, NULL, - cros_ec_sensors_capture, NULL); + ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, + cros_ec_sensors_capture, NULL); if (ret) return ret; - ret = iio_device_register(indio_dev); - if (ret) - goto error_uninit_buffer; - - return 0; - -error_uninit_buffer: - iio_triggered_buffer_cleanup(indio_dev); - - return ret; -} - -static int cros_ec_sensors_remove(struct platform_device *pdev) -{ - struct iio_dev *indio_dev = platform_get_drvdata(pdev); - - iio_device_unregister(indio_dev); - iio_triggered_buffer_cleanup(indio_dev); - - return 0; + return devm_iio_device_register(dev, indio_dev); } static const struct platform_device_id cros_ec_sensors_ids[] = { @@ -313,7 +294,6 @@ static struct platform_driver cros_ec_sensors_platform_driver = { .name = "cros-ec-sensors", }, .probe = cros_ec_sensors_probe, - .remove = cros_ec_sensors_remove, .id_table = cros_ec_sensors_ids, }; module_platform_driver(cros_ec_sensors_platform_driver); |