Merge branch 'acpi-pci-hotplug' into acpi-hotplug

[mirror_ubuntu-artful-kernel.git] / drivers / video / tmiofb.c

diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
index deb8733f3c70dd3f8e83508b8ff086cbf6cbcdbf..7fb4e321a43114894a51beaeba3601b9a0baae06 100644 (file)
--- a/drivers/video/tmiofb.c
+++ b/drivers/video/tmiofb.c
@@ -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 = dev->dev.platform_data;
+       struct tmio_fb_data *data = dev_get_platdata(&dev->dev);
        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 = dev->dev.platform_data;
+       struct tmio_fb_data *data = dev_get_platdata(&dev->dev);
        struct fb_info *info = platform_get_drvdata(dev);
        struct fb_videomode *mode = info->mode;
        struct tmiofb_par *par = info->par;
@@ -557,7 +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 = info->device->platform_data;
+       struct tmio_fb_data *data = dev_get_platdata(info->device);
        struct fb_videomode *best = NULL;
        int i;
 
@@ -577,7 +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 = info->device->platform_data;
+       struct tmio_fb_data *data = dev_get_platdata(info->device);
 
        mode = tmiofb_find_mode(info, var);
        if (!mode || var->bits_per_pixel > 16)
@@ -678,7 +678,7 @@ static struct fb_ops tmiofb_ops = {
 static int tmiofb_probe(struct platform_device *dev)
 {
        const struct mfd_cell *cell = mfd_get_cell(dev);
-       struct tmio_fb_data *data = dev->dev.platform_data;
+       struct tmio_fb_data *data = dev_get_platdata(&dev->dev);
        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);
@@ -781,8 +781,7 @@ static int tmiofb_probe(struct platform_device *dev)
        if (retval < 0)
                goto err_register_framebuffer;
 
-       printk(KERN_INFO "fb%d: %s frame buffer device\n",
-                               info->node, info->fix.id);
+       fb_info(info, "%s frame buffer device\n", info->fix.id);
 
        return 0;