tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mfd: Fix 7l66 and 6387 according to the new mfd-core API

Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

Samuel Ortiz 56bf2bda befb8444

+10 -5
+8 -3
drivers/mfd/t7l66xb.c
··· 338 338 t7l66xb_attach_irq(dev); 339 339 340 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), 343 - iomem, t7l66xb->irq_base); 346 + ret = mfd_add_devices(&dev->dev, dev->id, 347 + t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells), 348 + iomem, t7l66xb->irq_base); 344 349 345 350 if (!ret) 346 351 return 0; ··· 371 366 t7l66xb_detach_irq(dev); 372 367 iounmap(t7l66xb->scr); 373 368 release_resource(&t7l66xb->rscr); 374 - mfd_remove_devices(dev); 369 + mfd_remove_devices(&dev->dev); 375 370 platform_set_drvdata(dev, NULL); 376 371 kfree(t7l66xb); 377 372
+2 -2
drivers/mfd/tc6387xb.c
··· 119 119 120 120 printk(KERN_INFO "Toshiba tc6387xb initialised\n"); 121 121 122 - ret = mfd_add_devices(dev, tc6387xb_cells, 123 - ARRAY_SIZE(tc6387xb_cells), iomem, irq); 122 + ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells, 123 + ARRAY_SIZE(tc6387xb_cells), iomem, irq); 124 124 125 125 if (!ret) 126 126 return 0;