[PATCH] Input: ambakmi - Use managed interfaces

[Himangi Saraogi]

This patch introduces the use of managed interfaces like devm_clk_get,
devm_kalloc etc. devm_ioremap_resource is used instead of
amba_request_regions and devm_ioremap. It also does away with the functions
to free the allocated memory in probe and remove functions. Also, some
labels in the probe function are removed.

Signed-off-by: Himangi Saraogi <himangi...@gmail.com>
Acked-by: Julia Lawall <julia.law...@lip6.fr>
---
 drivers/input/serio/ambakmi.c | 44 ++++++++++---------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 8b748d9..405a175 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -23,6 +23,7 @@
 #include <linux/clk.h>
 
 #include <asm/io.h>
+#include <linux/io.h>
 #include <asm/irq.h>
 
 #define KMI_BASE       (kmi->base)
@@ -112,19 +113,10 @@ static int amba_kmi_probe(struct amba_device *dev,
 {
        struct amba_kmi_port *kmi;
        struct serio *io;
-       int ret;
-
-       ret = amba_request_regions(dev, NULL);
-       if (ret)
-               return ret;
-
-       kmi = kzalloc(sizeof(struct amba_kmi_port), GFP_KERNEL);
-       io = kzalloc(sizeof(struct serio), GFP_KERNEL);
-       if (!kmi || !io) {
-               ret = -ENOMEM;
-               goto out;
-       }
 
+       io = devm_kzalloc(&dev->dev, sizeof(struct serio), GFP_KERNEL);
+       if (!io)
+               return -ENOMEM;
 
        io->id.type     = SERIO_8042;
        io->write       = amba_kmi_write;
@@ -135,32 +127,20 @@ static int amba_kmi_probe(struct amba_device *dev,
        io->port_data   = kmi;
        io->dev.parent  = &dev->dev;
 
+       kmi->base       = devm_ioremap_resource(&dev->dev, &dev->res);
+       if (IS_ERR(kmi->base))
+               return PTR_ERR(kmi->base);
        kmi->io         = io;
-       kmi->base       = ioremap(dev->res.start, resource_size(&dev->res));
-       if (!kmi->base) {
-               ret = -ENOMEM;
-               goto out;
-       }
 
-       kmi->clk = clk_get(&dev->dev, "KMIREFCLK");
-       if (IS_ERR(kmi->clk)) {
-               ret = PTR_ERR(kmi->clk);
-               goto unmap;
-       }
+       kmi->clk = devm_clk_get(&dev->dev, "KMIREFCLK");
+       if (IS_ERR(kmi->clk))
+               return PTR_ERR(kmi->clk);
 
        kmi->irq = dev->irq[0];
        amba_set_drvdata(dev, kmi);
 
        serio_register_port(kmi->io);
        return 0;
-
- unmap:
-       iounmap(kmi->base);
- out:
-       kfree(kmi);
-       kfree(io);
-       amba_release_regions(dev);
-       return ret;
 }
 
 static int amba_kmi_remove(struct amba_device *dev)
@@ -168,10 +148,6 @@ static int amba_kmi_remove(struct amba_device *dev)
        struct amba_kmi_port *kmi = amba_get_drvdata(dev);
 
        serio_unregister_port(kmi->io);
-       clk_put(kmi->clk);
-       iounmap(kmi->base);
-       kfree(kmi);
-       amba_release_regions(dev);
        return 0;
 }
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html