mfd/mc13783: new function reading irq mask and status register

[safe/jmp/linux-2.6] / drivers / mfd / mfd-core.c

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 4dc861a..ae15e49 100644 (file)
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -15,28 +15,32 @@
 #include <linux/platform_device.h>
 #include <linux/mfd/core.h>
 
-static int mfd_add_device(struct platform_device *parent,
-               const struct mfd_cell *cell,
-               struct resource *mem_base,
-               int irq_base)
+static int mfd_add_device(struct device *parent, int id,
+                         const struct mfd_cell *cell,
+                         struct resource *mem_base,
+                         int irq_base)
 {
-       struct resource res[cell->num_resources];
+       struct resource *res;
        struct platform_device *pdev;
        int ret = -ENOMEM;
        int r;
 
-       pdev = platform_device_alloc(cell->name, parent->id);
+       pdev = platform_device_alloc(cell->name, id + cell->id);
        if (!pdev)
                goto fail_alloc;
 
-       pdev->dev.parent = &parent->dev;
+       res = kzalloc(sizeof(*res) * cell->num_resources, GFP_KERNEL);
+       if (!res)
+               goto fail_device;
+
+       pdev->dev.parent = parent;
+       platform_set_drvdata(pdev, cell->driver_data);
 
        ret = platform_device_add_data(pdev,
-                       cell, sizeof(struct mfd_cell));
+                       cell->platform_data, cell->data_size);
        if (ret)
-               goto fail_device;
+               goto fail_res;
 
-       memset(res, 0, sizeof(res));
        for (r = 0; r < cell->num_resources; r++) {
                res[r].name = cell->resources[r].name;
                res[r].flags = cell->resources[r].flags;
@@ -64,28 +68,31 @@ static int mfd_add_device(struct platform_device *parent,
 
        ret = platform_device_add(pdev);
        if (ret)
-               goto fail_device;
+               goto fail_res;
+
+       kfree(res);
 
        return 0;
 
 /*     platform_device_del(pdev); */
+fail_res:
+       kfree(res);
 fail_device:
        platform_device_put(pdev);
 fail_alloc:
        return ret;
 }
 
-int mfd_add_devices(
-               struct platform_device *parent,
-               const struct mfd_cell *cells, int n_devs,
-               struct resource *mem_base,
-               int irq_base)
+int mfd_add_devices(struct device *parent, int id,
+                   const struct mfd_cell *cells, int n_devs,
+                   struct resource *mem_base,
+                   int irq_base)
 {
        int i;
        int ret = 0;
 
        for (i = 0; i < n_devs; i++) {
-               ret = mfd_add_device(parent, cells + i, mem_base, irq_base);
+               ret = mfd_add_device(parent, id, cells + i, mem_base, irq_base);
                if (ret)
                        break;
        }
@@ -103,9 +110,9 @@ static int mfd_remove_devices_fn(struct device *dev, void *unused)
        return 0;
 }
 
-void mfd_remove_devices(struct platform_device *parent)
+void mfd_remove_devices(struct device *parent)
 {
-       device_for_each_child(&parent->dev, NULL, mfd_remove_devices_fn);
+       device_for_each_child(parent, NULL, mfd_remove_devices_fn);
 }
 EXPORT_SYMBOL(mfd_remove_devices);