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

Commit 962ed43a authored by Stefan Wahren's avatar Stefan Wahren Committed by Jonathan Cameron
Browse files

iio: mxs-lradc: remove mxs_lradc_ts_unregister 



After using devm_input_allocate_device for registration
the function mxs_lradc_ts_unregister isn't necessary anymore
since mxs_lradc_ts_close already does the job.

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Suggested-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent a91e0b6d

drivers/iio/adc/mxs-lradc.c

+1 −12
Original line number Diff line number Diff line
@@ -1148,14 +1148,6 @@ static int mxs_lradc_ts_register(struct mxs_lradc *lradc) 
	return input_register_device(input);

}



static void mxs_lradc_ts_unregister(struct mxs_lradc *lradc)

{

	if (!lradc->use_touchscreen)

		return;



	mxs_lradc_disable_ts(lradc);

}



/*

 * IRQ Handling

 */
@@ -1715,13 +1707,11 @@ static int mxs_lradc_probe(struct platform_device *pdev) 
	ret = iio_device_register(iio);

	if (ret) {

		dev_err(dev, "Failed to register IIO device\n");

		goto err_ts;

		return ret;

	}



	return 0;



err_ts:

	mxs_lradc_ts_unregister(lradc);

err_ts_register:

	mxs_lradc_hw_stop(lradc);

err_dev:
@@ -1739,7 +1729,6 @@ static int mxs_lradc_remove(struct platform_device *pdev) 
	struct mxs_lradc *lradc = iio_priv(iio);



	iio_device_unregister(iio);

	mxs_lradc_ts_unregister(lradc);

	mxs_lradc_hw_stop(lradc);

	mxs_lradc_trigger_remove(iio);

	iio_triggered_buffer_cleanup(iio);