Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56bf2bda authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

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



Signed-off-by: default avatarSamuel Ortiz <sameo@openedhand.com>
parent befb8444

drivers/mfd/t7l66xb.c

+8 −3
Original line number Diff line number Diff line
@@ -338,8 +338,13 @@ 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),

	ret = mfd_add_devices(&dev->dev, dev->id,

			      t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells),

			      iomem, t7l66xb->irq_base);



	if (!ret)
@@ -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);

drivers/mfd/tc6387xb.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int tc6387xb_probe(struct platform_device *dev) 


	printk(KERN_INFO "Toshiba tc6387xb initialised\n");



	ret = mfd_add_devices(dev, tc6387xb_cells,

	ret = mfd_add_devices(&dev->dev, dev->id, tc6387xb_cells,

			      ARRAY_SIZE(tc6387xb_cells), iomem, irq);



	if (!ret)