aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@openedhand.com>2008-06-20 05:07:39 -0400
committerSamuel Ortiz <samuel@sortiz.org>2008-07-20 13:54:51 -0400
commit1effe5bc6cfbac4506d7944d68dadbd29ad62645 (patch)
tree805545bcfba7026e565de14ee251b03739872f34
parent6f2384c4bdd4be3dc1e5d22ed5e6f0c3076fda60 (diff)
mfd: asic3 children platform data removal
Platform devices should be dynamically allocated, and each supported device should have its own platform data. For now we just remove this buggy code. Signed-off-by: Samuel Ortiz <sameo@openedhand.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-rw-r--r--drivers/mfd/asic3.c8
-rw-r--r--include/linux/mfd/asic3.h3
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index c70e7a5a5a90..dfee0a2ba167 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -604,14 +604,6 @@ static int asic3_probe(struct platform_device *pdev)
604 goto out_irq; 604 goto out_irq;
605 } 605 }
606 606
607 if (pdata->children) {
608 int i;
609 for (i = 0; i < pdata->n_children; i++) {
610 pdata->children[i]->dev.parent = &pdev->dev;
611 platform_device_register(pdata->children[i]);
612 }
613 }
614
615 printk(KERN_INFO "ASIC3 Core driver\n"); 607 printk(KERN_INFO "ASIC3 Core driver\n");
616 608
617 return 0; 609 return 0;
diff --git a/include/linux/mfd/asic3.h b/include/linux/mfd/asic3.h
index 06ef8165f406..b1c365800ab5 100644
--- a/include/linux/mfd/asic3.h
+++ b/include/linux/mfd/asic3.h
@@ -32,9 +32,6 @@ struct asic3_platform_data {
32 unsigned int irq_base; 32 unsigned int irq_base;
33 33
34 unsigned int gpio_base; 34 unsigned int gpio_base;
35
36 struct platform_device **children;
37 unsigned int n_children;
38}; 35};
39 36
40#define ASIC3_NUM_GPIO_BANKS 4 37#define ASIC3_NUM_GPIO_BANKS 4