Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c

+3 −23
Original line number Diff line number Diff line
@@ -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,

	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);