Input: jornada720_kbd - switch to devm_* APIs

Switch the jornada720_kbd driver to use the devm_* APIs.  This is in
preparation to removing the mach/irqs.h include from this driver.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c
index 421d9c55b0e896ed3f8d144f1544a4a98ae095a1..0a7832e0e05a8b4a708fef7ba5353258021783e7 100644 (file)
--- a/drivers/input/keyboard/jornada720_kbd.c
+++ b/drivers/input/keyboard/jornada720_kbd.c
@@ -99,12 +99,10 @@ static int jornada720_kbd_probe(struct platform_device *pdev)
        struct input_dev *input_dev;
        int i, err;
 
-       jornadakbd = kzalloc(sizeof(struct jornadakbd), GFP_KERNEL);
-       input_dev = input_allocate_device();
-       if (!jornadakbd || !input_dev) {
-               err = -ENOMEM;
-               goto fail1;
-       }
+       jornadakbd = devm_kzalloc(&pdev->dev, sizeof(*jornadakbd), GFP_KERNEL);
+       input_dev = devm_input_allocate_device(&pdev->dev);
+       if (!jornadakbd || !input_dev)
+               return -ENOMEM;
 
        platform_set_drvdata(pdev, jornadakbd);
 
@@ -127,40 +125,16 @@ static int jornada720_kbd_probe(struct platform_device *pdev)
 
        input_set_capability(input_dev, EV_MSC, MSC_SCAN);
 
-       err = request_irq(IRQ_GPIO0,
-                         jornada720_kbd_interrupt,
-                         IRQF_TRIGGER_FALLING,
-                         "jornadakbd", pdev);
+       err = devm_request_irq(&pdev->dev, IRQ_GPIO0, jornada720_kbd_interrupt,
+                              IRQF_TRIGGER_FALLING, "jornadakbd", pdev);
        if (err) {
                printk(KERN_INFO "jornadakbd720_kbd: Unable to grab IRQ\n");
-               goto fail1;
+               return err;
        }
 
-       err = input_register_device(jornadakbd->input);
-       if (err)
-               goto fail2;
-
-       return 0;
-
- fail2:        /* IRQ, DEVICE, MEMORY */
-       free_irq(IRQ_GPIO0, pdev);
- fail1:        /* DEVICE, MEMORY */
-       input_free_device(input_dev);
-       kfree(jornadakbd);
-       return err;
+       return input_register_device(jornadakbd->input);
 };
 
-static int jornada720_kbd_remove(struct platform_device *pdev)
-{
-       struct jornadakbd *jornadakbd = platform_get_drvdata(pdev);
-
-       free_irq(IRQ_GPIO0, pdev);
-       input_unregister_device(jornadakbd->input);
-       kfree(jornadakbd);
-
-       return 0;
-}
-
 /* work with hotplug and coldplug */
 MODULE_ALIAS("platform:jornada720_kbd");
 
@@ -169,6 +143,5 @@ static struct platform_driver jornada720_kbd_driver = {
                .name    = "jornada720_kbd",
         },
        .probe   = jornada720_kbd_probe,
-       .remove  = jornada720_kbd_remove,
 };
 module_platform_driver(jornada720_kbd_driver);