GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-16 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

iio: mxs-lradc: simplify TS registration

Browse source 
This patch simplifies the TS registration of mxs-lradc by
using devm_input_allocate_device.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Stefan Wahren 2016-04-23 19:57:57 +00:00 • committed by Jonathan Cameron
parent 32133be676
commit a91e0b6de4
1 changed files with 2 additions and 8 deletions

10
drivers/iio/adc/mxs-lradc.c
View file

@ -1120,18 +1120,16 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc)
{ {
struct input_dev *input; struct input_dev *input;
struct device *dev = lradc->dev; struct device *dev = lradc->dev;
int ret;
if (!lradc->use_touchscreen) if (!lradc->use_touchscreen)
return 0; return 0;
input = input_allocate_device(); input = devm_input_allocate_device(dev);
if (!input) if (!input)
return -ENOMEM; return -ENOMEM;
input->name = DRIVER_NAME; input->name = DRIVER_NAME;
input->id.bustype = BUS_HOST; input->id.bustype = BUS_HOST;
input->dev.parent = dev;
input->open = mxs_lradc_ts_open; input->open = mxs_lradc_ts_open;
input->close = mxs_lradc_ts_close; input->close = mxs_lradc_ts_close;
@ -1146,11 +1144,8 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc)
lradc->ts_input = input; lradc->ts_input = input;
input_set_drvdata(input, lradc); input_set_drvdata(input, lradc);
ret = input_register_device(input);
if (ret)
input_free_device(lradc->ts_input);
return ret; return input_register_device(input);
} }
static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc) static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc)
@ -1159,7 +1154,6 @@ static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc)
return; return;
mxs_lradc_disable_ts(lradc); mxs_lradc_disable_ts(lradc);
input_unregister_device(lradc->ts_input);
} }
/* /*