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

Commit 7dc00a0d authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

mtd: Use platform_data to retrieve tmio_nand platform bits 



With the addition of the platform device mfd_cell pointer, we can now
cleanly pass the sub device drivers platform data pointers through the
regular device platform_data one, and get rid of mfd_get_data().

Cc: Ian Molton <spyro@f2s.com>
Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Acked-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 1f8c666c

drivers/mfd/t7l66xb.c

+2 −1
Original line number Diff line number Diff line
@@ -383,7 +383,8 @@ static int t7l66xb_probe(struct platform_device *dev) 


	t7l66xb_attach_irq(dev);



	t7l66xb_cells[T7L66XB_CELL_NAND].mfd_data = pdata->nand_data;

	t7l66xb_cells[T7L66XB_CELL_NAND].platform_data = pdata->nand_data;

	t7l66xb_cells[T7L66XB_CELL_NAND].pdata_size = sizeof(*pdata->nand_data);



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

			      t7l66xb_cells, ARRAY_SIZE(t7l66xb_cells),

drivers/mfd/tc6393xb.c

+3 −1
Original line number Diff line number Diff line
@@ -693,7 +693,9 @@ static int __devinit tc6393xb_probe(struct platform_device *dev) 
			goto err_setup;

	}



	tc6393xb_cells[TC6393XB_CELL_NAND].mfd_data = tcpd->nand_data;

	tc6393xb_cells[TC6393XB_CELL_NAND].platform_data = tcpd->nand_data;

	tc6393xb_cells[TC6393XB_CELL_NAND].pdata_size =

						sizeof(*tcpd->nand_data);

	tc6393xb_cells[TC6393XB_CELL_FB].platform_data = tcpd->fb_data;

	tc6393xb_cells[TC6393XB_CELL_FB].pdata_size = sizeof(*tcpd->fb_data);

drivers/mtd/nand/tmio_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ static void tmio_hw_stop(struct platform_device *dev, struct tmio_nand *tmio) 


static int tmio_probe(struct platform_device *dev)

{

	struct tmio_nand_data *data = mfd_get_data(dev);

	struct tmio_nand_data *data = dev->dev.platform_data;

	struct resource *fcr = platform_get_resource(dev,

			IORESOURCE_MEM, 0);

	struct resource *ccr = platform_get_resource(dev,