1 files changed, 13 insertions, 32 deletions

diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c
index 7324c5c0fb86..62af48bbcc27 100644
--- a/drivers/input/touchscreen/jornada720_ts.c
+++ b/drivers/input/touchscreen/jornada720_ts.c
@@ -104,13 +104,13 @@ static int jornada720_ts_probe(struct platform_device *pdev)
         struct input_dev *input_dev;
         int error;
 
-        jornada_ts = kzalloc(sizeof(struct jornada_ts), GFP_KERNEL);
-        input_dev = input_allocate_device();
+        jornada_ts = devm_kzalloc(&pdev->dev, sizeof(*jornada_ts), GFP_KERNEL);
+        if (!jornada_ts)
+                return -ENOMEM;
 
-        if (!jornada_ts || !input_dev) {
-                error = -ENOMEM;
-                goto fail1;
-        }
+        input_dev = devm_input_allocate_device(&pdev->dev);
+        if (!input_dev)
+                return -ENOMEM;
 
         platform_set_drvdata(pdev, jornada_ts);
 
@@ -126,36 +126,18 @@ static int jornada720_ts_probe(struct platform_device *pdev)
         input_set_abs_params(input_dev, ABS_X, 270, 3900, 0, 0);
         input_set_abs_params(input_dev, ABS_Y, 180, 3700, 0, 0);
 
-        error = request_irq(IRQ_GPIO9,
-                        jornada720_ts_interrupt,
-                        IRQF_TRIGGER_RISING,
-                        "HP7XX Touchscreen driver", pdev);
+        error = devm_request_irq(&pdev->dev, IRQ_GPIO9,
+                                 jornada720_ts_interrupt,
+                                 IRQF_TRIGGER_RISING,
+                                 "HP7XX Touchscreen driver", pdev);
         if (error) {
-                printk(KERN_INFO "HP7XX TS : Unable to acquire irq!\n");
-                goto fail1;
+                dev_err(&pdev->dev, "HP7XX TS : Unable to acquire irq!\n");
+                return error;
         }
 
         error = input_register_device(jornada_ts->dev);
         if (error)
-                goto fail2;
-
-        return 0;
-
- fail2:
-        free_irq(IRQ_GPIO9, pdev);
- fail1:
-        input_free_device(input_dev);
-        kfree(jornada_ts);
-        return error;
-}
-
-static int jornada720_ts_remove(struct platform_device *pdev)
-{
-        struct jornada_ts *jornada_ts = platform_get_drvdata(pdev);
-
-        free_irq(IRQ_GPIO9, pdev);
-        input_unregister_device(jornada_ts->dev);
-        kfree(jornada_ts);
+                return error;
 
         return 0;
 }
@@ -165,7 +147,6 @@ MODULE_ALIAS("platform:jornada_ts");
 
 static struct platform_driver jornada720_ts_driver = {
         .probe          = jornada720_ts_probe,
-        .remove         = jornada720_ts_remove,
         .driver         = {
                 .name   = "jornada_ts",
                 .owner  = THIS_MODULE,