aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@openedhand.com>2008-07-31 18:16:13 -0400
committerSamuel Ortiz <sameo@openedhand.com>2008-08-10 14:10:06 -0400
commit56bf2bda0651ca368a259468e4f309c71ed35c35 (patch)
tree5e06540fb9bac40914840c0b166af06ed224690c /drivers
parentbefb844415f4e3b9c48594d05238a8a4c2af8941 (diff)
mfd: Fix 7l66 and 6387 according to the new mfd-core API
Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/t7l66xb.c11
-rw-r--r--drivers/mfd/tc6387xb.c4
2 files changed, 10 insertions, 5 deletions
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index 5be42054f739..2d715fcea76f 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -338,9 +338,14 @@ static int t7l66xb_probe(struct platform_device *dev)
338 t7l66xb_attach_irq(dev); 338 t7l66xb_attach_irq(dev);
339 339
340 t7l66xb_cells[T7L66XB_CELL_NAND].driver_data = pdata->nand_data; 340 t7l66xb_cells[T7L66XB_CELL_NAND].driver_data = pdata->nand_data;
341 t7l66xb_cells[T7L66XB_CELL_NAND].platform_data =
342 &t7l66xb_cells[T7L66XB_CELL_NAND];
343 t7l66xb_cells[T7L66XB_CELL_NAND].data_size =
344 sizeof(t7l66xb_cells[T7L66XB_CELL_NAND]);
341 345
342 ret = mfd_add_devices(dev, t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells), 346 ret = mfd_add_devices(&dev->dev, dev->id,
343 iomem, t7l66xb->irq_base); 347 t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells),
348 iomem, t7l66xb->irq_base);
344 349
345 if (!ret) 350 if (!ret)
346 return 0; 351 return 0;
@@ -366,7 +371,7 @@ static int t7l66xb_remove(struct platform_device *dev)
366 t7l66xb_detach_irq(dev); 371 t7l66xb_detach_irq(dev);
367 iounmap(t7l66xb->scr); 372 iounmap(t7l66xb->scr);
368 release_resource(&t7l66xb->rscr); 373 release_resource(&t7l66xb->rscr);
369 mfd_remove_devices(dev); 374 mfd_remove_devices(&dev->dev);
370 platform_set_drvdata(dev, NULL); 375 platform_set_drvdata(dev, NULL);
371 kfree(t7l66xb); 376 kfree(t7l66xb);
372 377
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c
index 03718feda4d8..9fd6f80b50f6 100644
--- a/drivers/mfd/tc6387xb.c
+++ b/drivers/mfd/tc6387xb.c
@@ -119,8 +119,8 @@ static int tc6387xb_probe(struct platform_device *dev)
119 119
120 printk(KERN_INFO "Toshiba tc6387xb initialised\n"); 120 printk(KERN_INFO "Toshiba tc6387xb initialised\n");
121 121
122 ret = mfd_add_devices(dev, tc6387xb_cells, 122 ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells,
123 ARRAY_SIZE(tc6387xb_cells), iomem, irq); 123 ARRAY_SIZE(tc6387xb_cells), iomem, irq);
124 124
125 if (!ret) 125 if (!ret)
126 return 0; 126 return 0;