forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Input: stmpe-ts - switch to using managed resources

Browse source 
This patch frees stmpe-ts driver from burden of freeing resources :)
devm_* derivatives of multiple routines are used while allocating resources,
which would be freed automatically by kernel.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Viresh Kumar 2012-11-09 23:56:59 -08:00 • committed by Dmitry Torokhov
parent aaa4f2a7f6
commit 2bd942f90a
1 changed files with 23 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

67
drivers/input/touchscreen/stmpe-ts.c
View file

@ -1,4 +1,5 @@
/* STMicroelectronics STMPE811 Touchscreen Driver /*
* STMicroelectronics STMPE811 Touchscreen Driver
* *
* (C) 2010 Luotao Fu <l.fu@pengutronix.de> * (C) 2010 Luotao Fu <l.fu@pengutronix.de>
* All rights reserved. * All rights reserved.
@ -264,28 +265,24 @@ static void stmpe_ts_close(struct input_dev *dev)
static int __devinit stmpe_input_probe(struct platform_device *pdev) static int __devinit stmpe_input_probe(struct platform_device *pdev)
{ {
struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent); struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);
struct stmpe_platform_data *pdata = stmpe->pdata; const struct stmpe_platform_data *pdata = stmpe->pdata;
const struct stmpe_ts_platform_data *ts_pdata = NULL;
struct stmpe_touch *ts; struct stmpe_touch *ts;
struct input_dev *idev; struct input_dev *idev;
struct stmpe_ts_platform_data *ts_pdata = NULL; int error;
int ret;
int ts_irq; int ts_irq;
ts_irq = platform_get_irq_byname(pdev, "FIFO_TH"); ts_irq = platform_get_irq_byname(pdev, "FIFO_TH");
if (ts_irq < 0) if (ts_irq < 0)
return ts_irq; return ts_irq;
ts = kzalloc(sizeof(*ts), GFP_KERNEL); ts = devm_kzalloc(&pdev->dev, sizeof(*ts), GFP_KERNEL);
if (!ts) { if (!ts)
ret = -ENOMEM; return -ENOMEM;
goto err_out;
}
idev = input_allocate_device(); idev = devm_input_allocate_device(&pdev->dev);
if (!idev) { if (!idev)
ret = -ENOMEM; return -ENOMEM;
goto err_free_ts;
}
platform_set_drvdata(pdev, ts); platform_set_drvdata(pdev, ts);
ts->stmpe = stmpe; ts->stmpe = stmpe;
@ -309,16 +306,17 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&ts->work, stmpe_work); INIT_DELAYED_WORK(&ts->work, stmpe_work);
ret = request_threaded_irq(ts_irq, NULL, stmpe_ts_handler, error = devm_request_threaded_irq(&pdev->dev, ts_irq,
IRQF_ONESHOT, STMPE_TS_NAME, ts); NULL, stmpe_ts_handler,
if (ret) { IRQF_ONESHOT, STMPE_TS_NAME, ts);
if (error) {
dev_err(&pdev->dev, "Failed to request IRQ %d\n", ts_irq); dev_err(&pdev->dev, "Failed to request IRQ %d\n", ts_irq);
goto err_free_input; return error;
} }
ret = stmpe_init_hw(ts); error = stmpe_init_hw(ts);
if (ret) if (error)
goto err_free_irq; return error;
idev->name = STMPE_TS_NAME; idev->name = STMPE_TS_NAME;
idev->id.bustype = BUS_I2C; idev->id.bustype = BUS_I2C;
@ -334,40 +332,21 @@ static int __devinit stmpe_input_probe(struct platform_device *pdev)
input_set_abs_params(idev, ABS_Y, 0, XY_MASK, 0, 0); input_set_abs_params(idev, ABS_Y, 0, XY_MASK, 0, 0);
input_set_abs_params(idev, ABS_PRESSURE, 0x0, 0xff, 0, 0); input_set_abs_params(idev, ABS_PRESSURE, 0x0, 0xff, 0, 0);
ret = input_register_device(idev); error = input_register_device(idev);
if (ret) { if (error) {
dev_err(&pdev->dev, "Could not register input device\n"); dev_err(&pdev->dev, "Could not register input device\n");
goto err_free_irq; return error;
} }
return ret; return 0;
err_free_irq:
free_irq(ts_irq, ts);
err_free_input:
input_free_device(idev);
platform_set_drvdata(pdev, NULL);
err_free_ts:
kfree(ts);
err_out:
return ret;
} }
static int __devexit stmpe_ts_remove(struct platform_device *pdev) static int __devexit stmpe_ts_remove(struct platform_device *pdev)
{ {
struct stmpe_touch *ts = platform_get_drvdata(pdev); struct stmpe_touch *ts = platform_get_drvdata(pdev);
unsigned int ts_irq = platform_get_irq_byname(pdev, "FIFO_TH");
stmpe_disable(ts->stmpe, STMPE_BLOCK_TOUCHSCREEN); stmpe_disable(ts->stmpe, STMPE_BLOCK_TOUCHSCREEN);
free_irq(ts_irq, ts);
platform_set_drvdata(pdev, NULL);
input_unregister_device(ts->idev);
kfree(ts);
return 0; return 0;
} }