Commit 754434c4 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by Jonathan Cameron

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: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 48ba7c3c
...@@ -267,31 +267,12 @@ static int cros_ec_sensors_probe(struct platform_device *pdev) ...@@ -267,31 +267,12 @@ static int cros_ec_sensors_probe(struct platform_device *pdev)
else else
state->core.read_ec_sensors_data = cros_ec_sensors_read_cmd; state->core.read_ec_sensors_data = cros_ec_sensors_read_cmd;
ret = iio_triggered_buffer_setup(indio_dev, NULL, ret = devm_iio_triggered_buffer_setup(dev, indio_dev, NULL,
cros_ec_sensors_capture, NULL); cros_ec_sensors_capture, NULL);
if (ret) if (ret)
return ret; return ret;
ret = iio_device_register(indio_dev); return devm_iio_device_register(dev, 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;
} }
static const struct platform_device_id cros_ec_sensors_ids[] = { static const struct platform_device_id cros_ec_sensors_ids[] = {
...@@ -313,7 +294,6 @@ static struct platform_driver cros_ec_sensors_platform_driver = { ...@@ -313,7 +294,6 @@ static struct platform_driver cros_ec_sensors_platform_driver = {
.name = "cros-ec-sensors", .name = "cros-ec-sensors",
}, },
.probe = cros_ec_sensors_probe, .probe = cros_ec_sensors_probe,
.remove = cros_ec_sensors_remove,
.id_table = cros_ec_sensors_ids, .id_table = cros_ec_sensors_ids,
}; };
module_platform_driver(cros_ec_sensors_platform_driver); module_platform_driver(cros_ec_sensors_platform_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