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

Commit 1f8c666c authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

fb: Use platform_data to retrieve tmiofb 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: Paul Mundt <lethal@linux-sh.org>
Acked-by: default avatarDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 9e554696

drivers/mfd/tc6393xb.c

+2 −1
Original line number Diff line number Diff line
@@ -694,7 +694,8 @@ static int __devinit tc6393xb_probe(struct platform_device *dev) 
	}



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

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

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

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



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

			tc6393xb_cells, ARRAY_SIZE(tc6393xb_cells),

drivers/video/tmiofb.c

+5 −7
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static irqreturn_t tmiofb_irq(int irq, void *__info) 
 */

static int tmiofb_hw_stop(struct platform_device *dev)

{

	struct tmio_fb_data *data = mfd_get_data(dev);

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

	struct fb_info *info = platform_get_drvdata(dev);

	struct tmiofb_par *par = info->par;
@@ -311,7 +311,7 @@ static int tmiofb_hw_init(struct platform_device *dev) 
 */

static void tmiofb_hw_mode(struct platform_device *dev)

{

	struct tmio_fb_data *data = mfd_get_data(dev);

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

	struct fb_info *info = platform_get_drvdata(dev);

	struct fb_videomode *mode = info->mode;

	struct tmiofb_par *par = info->par;
@@ -557,8 +557,7 @@ static int tmiofb_ioctl(struct fb_info *fbi, 
static struct fb_videomode *

tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var)

{

	struct tmio_fb_data *data =

			mfd_get_data(to_platform_device(info->device));

	struct tmio_fb_data *data = info->device->platform_data;

	struct fb_videomode *best = NULL;

	int i;
@@ -578,8 +577,7 @@ static int tmiofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) 
{



	struct fb_videomode *mode;

	struct tmio_fb_data *data =

			mfd_get_data(to_platform_device(info->device));

	struct tmio_fb_data *data = info->device->platform_data;



	mode = tmiofb_find_mode(info, var);

	if (!mode || var->bits_per_pixel > 16)
@@ -680,7 +678,7 @@ static struct fb_ops tmiofb_ops = { 
static int __devinit tmiofb_probe(struct platform_device *dev)

{

	const struct mfd_cell *cell = mfd_get_cell(dev);

	struct tmio_fb_data *data = mfd_get_data(dev);

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

	struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);

	struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);

	struct resource *vram = platform_get_resource(dev, IORESOURCE_MEM, 2);