Commit 99e8325f authored by Sebastian Reichel's avatar Sebastian Reichel Committed by Dmitry Torokhov

Input: tsc2005 - convert driver to use devm_*

Simplify the driver by using managed resources for memory allocation of
internal structure, input device allocation and irq request.
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 6e51c857
...@@ -604,12 +604,13 @@ static int tsc2005_probe(struct spi_device *spi) ...@@ -604,12 +604,13 @@ static int tsc2005_probe(struct spi_device *spi)
if (error) if (error)
return error; return error;
ts = kzalloc(sizeof(*ts), GFP_KERNEL); ts = devm_kzalloc(&spi->dev, sizeof(*ts), GFP_KERNEL);
input_dev = input_allocate_device(); if (!ts)
if (!ts || !input_dev) { return -ENOMEM;
error = -ENOMEM;
goto err_free_mem; input_dev = devm_input_allocate_device(&spi->dev);
} if (!input_dev)
return -ENOMEM;
ts->spi = spi; ts->spi = spi;
ts->idev = input_dev; ts->idev = input_dev;
...@@ -649,12 +650,13 @@ static int tsc2005_probe(struct spi_device *spi) ...@@ -649,12 +650,13 @@ static int tsc2005_probe(struct spi_device *spi)
/* Ensure the touchscreen is off */ /* Ensure the touchscreen is off */
tsc2005_stop_scan(ts); tsc2005_stop_scan(ts);
error = request_threaded_irq(spi->irq, NULL, tsc2005_irq_thread, error = devm_request_threaded_irq(&spi->dev, spi->irq, NULL,
IRQF_TRIGGER_RISING | IRQF_ONESHOT, tsc2005_irq_thread,
"tsc2005", ts); IRQF_TRIGGER_RISING | IRQF_ONESHOT,
"tsc2005", ts);
if (error) { if (error) {
dev_err(&spi->dev, "Failed to request irq, err: %d\n", error); dev_err(&spi->dev, "Failed to request irq, err: %d\n", error);
goto err_free_mem; return error;
} }
spi_set_drvdata(spi, ts); spi_set_drvdata(spi, ts);
...@@ -662,7 +664,7 @@ static int tsc2005_probe(struct spi_device *spi) ...@@ -662,7 +664,7 @@ static int tsc2005_probe(struct spi_device *spi)
if (error) { if (error) {
dev_err(&spi->dev, dev_err(&spi->dev,
"Failed to create sysfs attributes, err: %d\n", error); "Failed to create sysfs attributes, err: %d\n", error);
goto err_clear_drvdata; return error;
} }
error = input_register_device(ts->idev); error = input_register_device(ts->idev);
...@@ -677,23 +679,12 @@ static int tsc2005_probe(struct spi_device *spi) ...@@ -677,23 +679,12 @@ static int tsc2005_probe(struct spi_device *spi)
err_remove_sysfs: err_remove_sysfs:
sysfs_remove_group(&spi->dev.kobj, &tsc2005_attr_group); sysfs_remove_group(&spi->dev.kobj, &tsc2005_attr_group);
err_clear_drvdata:
free_irq(spi->irq, ts);
err_free_mem:
input_free_device(input_dev);
kfree(ts);
return error; return error;
} }
static int tsc2005_remove(struct spi_device *spi) static int tsc2005_remove(struct spi_device *spi)
{ {
struct tsc2005 *ts = spi_get_drvdata(spi); sysfs_remove_group(&spi->dev.kobj, &tsc2005_attr_group);
sysfs_remove_group(&ts->spi->dev.kobj, &tsc2005_attr_group);
free_irq(ts->spi->irq, ts);
input_unregister_device(ts->idev);
kfree(ts);
return 0; return 0;
} }
......
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