On Sat, Apr 26, 2014 at 01:56:17AM +0200, Sebastian Reichel wrote:
> Simplify the driver by using managed resources for memory allocation of
> internal struct, input device allocation and irq request.
>
> Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx>
Applied, thank you.
> ---
> drivers/input/touchscreen/tsc2005.c | 30 ++++++++++--------------------
> 1 file changed, 10 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
> index 520e673..9daaddd 100644
> --- a/drivers/input/touchscreen/tsc2005.c
> +++ b/drivers/input/touchscreen/tsc2005.c
> @@ -604,12 +604,10 @@ static int tsc2005_probe(struct spi_device *spi)
> if (error)
> return error;
>
> - ts = kzalloc(sizeof(*ts), GFP_KERNEL);
> - input_dev = input_allocate_device();
> - if (!ts || !input_dev) {
> - error = -ENOMEM;
> - goto err_free_mem;
> - }
> + ts = devm_kzalloc(&spi->dev, sizeof(*ts), GFP_KERNEL);
> + input_dev = devm_input_allocate_device(&spi->dev);
> + if (!ts || !input_dev)
> + return -ENOMEM;
>
> ts->spi = spi;
> ts->idev = input_dev;
> @@ -649,12 +647,13 @@ static int tsc2005_probe(struct spi_device *spi)
> /* Ensure the touchscreen is off */
> tsc2005_stop_scan(ts);
>
> - error = request_threaded_irq(spi->irq, NULL, tsc2005_irq_thread,
> - IRQF_TRIGGER_RISING | IRQF_ONESHOT,
> - "tsc2005", ts);
> + error = devm_request_threaded_irq(&spi->dev, spi->irq, NULL,
> + tsc2005_irq_thread,
> + IRQF_TRIGGER_RISING | IRQF_ONESHOT,
> + "tsc2005", ts);
> if (error) {
> dev_err(&spi->dev, "Failed to request irq, err: %d\n", error);
> - goto err_free_mem;
> + return error;
> }
>
> spi_set_drvdata(spi, ts);
> @@ -662,7 +661,7 @@ static int tsc2005_probe(struct spi_device *spi)
> if (error) {
> dev_err(&spi->dev,
> "Failed to create sysfs attributes, err: %d\n", error);
> - goto err_clear_drvdata;
> + return error;
> }
>
> error = input_register_device(ts->idev);
> @@ -677,11 +676,6 @@ static int tsc2005_probe(struct spi_device *spi)
>
> err_remove_sysfs:
> 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;
> }
>
> @@ -691,10 +685,6 @@ static int tsc2005_remove(struct spi_device *spi)
>
> 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;
> }
>
> --
> 1.9.2
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
