Merge branch 'fixes-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[~andy/linux] / drivers / i2c / busses / i2c-ocores.c

diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index c05e8c44404aa7c868496f8f0a35b6400caa619e..ef3bcb1ce864f01b9e03e5269acaaaadd108a223 100644 (file)
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -9,6 +9,41 @@
  * kind, whether express or implied.
  */
 
+/*
+ * Device tree configuration:
+ *
+ * Required properties:
+ * - compatible      : "opencores,i2c-ocores"
+ * - reg             : bus address start and address range size of device
+ * - interrupts      : interrupt number
+ * - regstep         : size of device registers in bytes
+ * - clock-frequency : frequency of bus clock in Hz
+ * 
+ * Example:
+ *
+ *  i2c0: ocores@a0000000 {
+ *              compatible = "opencores,i2c-ocores";
+ *              reg = <0xa0000000 0x8>;
+ *              interrupts = <10>;
+ *
+ *              regstep = <1>;
+ *              clock-frequency = <20000000>;
+ *
+ * -- Devices connected on this I2C bus get
+ * -- defined here; address- and size-cells
+ * -- apply to these child devices
+ *
+ *              #address-cells = <1>;
+ *              #size-cells = <0>;
+ *
+ *              dummy@60 {
+ *                     compatible = "dummy";
+ *                     reg = <60>;
+ *              };
+ *  };
+ *
+ */
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -253,22 +288,21 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
        if (!res2)
                return -ENODEV;
 
-       i2c = kzalloc(sizeof(*i2c), GFP_KERNEL);
+       i2c = devm_kzalloc(&pdev->dev, sizeof(*i2c), GFP_KERNEL);
        if (!i2c)
                return -ENOMEM;
 
-       if (!request_mem_region(res->start, resource_size(res),
-                               pdev->name)) {
+       if (!devm_request_mem_region(&pdev->dev, res->start,
+                                    resource_size(res), pdev->name)) {
                dev_err(&pdev->dev, "Memory region busy\n");
-               ret = -EBUSY;
-               goto request_mem_failed;
+               return -EBUSY;
        }
 
-       i2c->base = ioremap(res->start, resource_size(res));
+       i2c->base = devm_ioremap_nocache(&pdev->dev, res->start,
+                                        resource_size(res));
        if (!i2c->base) {
                dev_err(&pdev->dev, "Unable to map registers\n");
-               ret = -EIO;
-               goto map_failed;
+               return -EIO;
        }
 
        pdata = pdev->dev.platform_data;
@@ -284,10 +318,11 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
        ocores_init(i2c);
 
        init_waitqueue_head(&i2c->wait);
-       ret = request_irq(res2->start, ocores_isr, 0, pdev->name, i2c);
+       ret = devm_request_irq(&pdev->dev, res2->start, ocores_isr, 0,
+                              pdev->name, i2c);
        if (ret) {
                dev_err(&pdev->dev, "Cannot claim IRQ\n");
-               goto request_irq_failed;
+               return ret;
        }
 
        /* hook up driver to tree */
@@ -303,7 +338,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
        ret = i2c_add_adapter(&i2c->adap);
        if (ret) {
                dev_err(&pdev->dev, "Failed to add adapter\n");
-               goto add_adapter_failed;
+               return ret;
        }
 
        /* add in known devices to the bus */
@@ -313,23 +348,11 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
        }
 
        return 0;
-
-add_adapter_failed:
-       free_irq(res2->start, i2c);
-request_irq_failed:
-       iounmap(i2c->base);
-map_failed:
-       release_mem_region(res->start, resource_size(res));
-request_mem_failed:
-       kfree(i2c);
-
-       return ret;
 }
 
 static int __devexit ocores_i2c_remove(struct platform_device* pdev)
 {
        struct ocores_i2c *i2c = platform_get_drvdata(pdev);
-       struct resource *res;
 
        /* disable i2c logic */
        oc_setreg(i2c, OCI2C_CONTROL, oc_getreg(i2c, OCI2C_CONTROL)
@@ -339,18 +362,6 @@ static int __devexit ocores_i2c_remove(struct platform_device* pdev)
        i2c_del_adapter(&i2c->adap);
        platform_set_drvdata(pdev, NULL);
 
-       res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-       if (res)
-               free_irq(res->start, i2c);
-
-       iounmap(i2c->base);
-
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res)
-               release_mem_region(res->start, resource_size(res));
-
-       kfree(i2c);
-
        return 0;
 }