diff options
| author | Samuel Ortiz <sameo@openedhand.com> | 2008-08-01 00:16:13 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@openedhand.com> | 2008-08-10 20:10:06 +0200 |
| commit | 56bf2bda0651ca368a259468e4f309c71ed35c35 (patch) | |
| tree | 5e06540fb9bac40914840c0b166af06ed224690c /drivers/mfd | |
| parent | befb844415f4e3b9c48594d05238a8a4c2af8941 (diff) | |
| download | linux-stable-56bf2bda0651ca368a259468e4f309c71ed35c35.tar.gz linux-stable-56bf2bda0651ca368a259468e4f309c71ed35c35.tar.bz2 linux-stable-56bf2bda0651ca368a259468e4f309c71ed35c35.zip | |
mfd: Fix 7l66 and 6387 according to the new mfd-core API
Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/t7l66xb.c | 11 | ||||
| -rw-r--r-- | drivers/mfd/tc6387xb.c | 4 |
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) t7l66xb_attach_irq(dev); t7l66xb_cells[T7L66XB_CELL_NAND].driver_data = pdata->nand_data; + t7l66xb_cells[T7L66XB_CELL_NAND].platform_data = + &t7l66xb_cells[T7L66XB_CELL_NAND]; + t7l66xb_cells[T7L66XB_CELL_NAND].data_size = + sizeof(t7l66xb_cells[T7L66XB_CELL_NAND]); - ret = mfd_add_devices(dev, t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells), - iomem, t7l66xb->irq_base); + ret = mfd_add_devices(&dev->dev, dev->id, + t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells), + iomem, t7l66xb->irq_base); if (!ret) return 0; @@ -366,7 +371,7 @@ static int t7l66xb_remove(struct platform_device *dev) t7l66xb_detach_irq(dev); iounmap(t7l66xb->scr); release_resource(&t7l66xb->rscr); - mfd_remove_devices(dev); + mfd_remove_devices(&dev->dev); platform_set_drvdata(dev, NULL); kfree(t7l66xb); 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) printk(KERN_INFO "Toshiba tc6387xb initialised\n"); - ret = mfd_add_devices(dev, tc6387xb_cells, - ARRAY_SIZE(tc6387xb_cells), iomem, irq); + ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells, + ARRAY_SIZE(tc6387xb_cells), iomem, irq); if (!ret) return 0; |