aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/tmiofb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/tmiofb.c')
-rw-r--r--drivers/video/tmiofb.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
index 0c341d739604..cd1c4dcef8fd 100644
--- a/drivers/video/tmiofb.c
+++ b/drivers/video/tmiofb.c
@@ -250,7 +250,7 @@ static irqreturn_t tmiofb_irq(int irq, void *__info)
250 */ 250 */
251static int tmiofb_hw_stop(struct platform_device *dev) 251static int tmiofb_hw_stop(struct platform_device *dev)
252{ 252{
253 struct tmio_fb_data *data = mfd_get_data(dev); 253 struct tmio_fb_data *data = dev->dev.platform_data;
254 struct fb_info *info = platform_get_drvdata(dev); 254 struct fb_info *info = platform_get_drvdata(dev);
255 struct tmiofb_par *par = info->par; 255 struct tmiofb_par *par = info->par;
256 256
@@ -311,7 +311,7 @@ static int tmiofb_hw_init(struct platform_device *dev)
311 */ 311 */
312static void tmiofb_hw_mode(struct platform_device *dev) 312static void tmiofb_hw_mode(struct platform_device *dev)
313{ 313{
314 struct tmio_fb_data *data = mfd_get_data(dev); 314 struct tmio_fb_data *data = dev->dev.platform_data;
315 struct fb_info *info = platform_get_drvdata(dev); 315 struct fb_info *info = platform_get_drvdata(dev);
316 struct fb_videomode *mode = info->mode; 316 struct fb_videomode *mode = info->mode;
317 struct tmiofb_par *par = info->par; 317 struct tmiofb_par *par = info->par;
@@ -557,8 +557,7 @@ static int tmiofb_ioctl(struct fb_info *fbi,
557static struct fb_videomode * 557static struct fb_videomode *
558tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var) 558tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var)
559{ 559{
560 struct tmio_fb_data *data = 560 struct tmio_fb_data *data = info->device->platform_data;
561 mfd_get_data(to_platform_device(info->device));
562 struct fb_videomode *best = NULL; 561 struct fb_videomode *best = NULL;
563 int i; 562 int i;
564 563
@@ -578,8 +577,7 @@ static int tmiofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
578{ 577{
579 578
580 struct fb_videomode *mode; 579 struct fb_videomode *mode;
581 struct tmio_fb_data *data = 580 struct tmio_fb_data *data = info->device->platform_data;
582 mfd_get_data(to_platform_device(info->device));
583 581
584 mode = tmiofb_find_mode(info, var); 582 mode = tmiofb_find_mode(info, var);
585 if (!mode || var->bits_per_pixel > 16) 583 if (!mode || var->bits_per_pixel > 16)
@@ -680,7 +678,7 @@ static struct fb_ops tmiofb_ops = {
680static int __devinit tmiofb_probe(struct platform_device *dev) 678static int __devinit tmiofb_probe(struct platform_device *dev)
681{ 679{
682 const struct mfd_cell *cell = mfd_get_cell(dev); 680 const struct mfd_cell *cell = mfd_get_cell(dev);
683 struct tmio_fb_data *data = mfd_get_data(dev); 681 struct tmio_fb_data *data = dev->dev.platform_data;
684 struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1); 682 struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);
685 struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0); 683 struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);
686 struct resource *vram = platform_get_resource(dev, IORESOURCE_MEM, 2); 684 struct resource *vram = platform_get_resource(dev, IORESOURCE_MEM, 2);