4 files changed, 6 insertions, 13 deletions

diff --git a/drivers/video/sh_mipi_dsi.c b/drivers/video/sh_mipi_dsi.c
index ad09a05afd5f..1ede247547f9 100644
--- a/drivers/video/sh_mipi_dsi.c
+++ b/drivers/video/sh_mipi_dsi.c
@@ -394,8 +394,7 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi,
         return 0;
 }
 
-static int mipi_display_on(struct sh_mobile_lcdc_entity *entity,
-                           struct fb_info *info)
+static int mipi_display_on(struct sh_mobile_lcdc_entity *entity)
 {
         struct sh_mipi *mipi = to_sh_mipi(entity);
         struct sh_mipi_dsi_info *pdata = mipi->pdev->dev.platform_data;
diff --git a/drivers/video/sh_mobile_hdmi.c b/drivers/video/sh_mobile_hdmi.c
index bd885ee78d54..c22e123ec401 100644
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
@@ -1000,16 +1000,11 @@ static irqreturn_t sh_hdmi_hotplug(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-/* locking:     called with info->lock held, or before register_framebuffer() */
-static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity,
-                              struct fb_info *info)
+static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity)
 {
-        /*
-         * info is guaranteed to be valid, when we are called, because our
-         * FB_EVENT_FB_UNBIND notify is also called with info->lock held
-         */
         struct sh_hdmi *hdmi = entity_to_sh_hdmi(entity);
         struct sh_mobile_lcdc_chan *ch = entity->lcdc;
+        struct fb_info *info = ch->info;
 
         dev_dbg(hdmi->dev, "%s(%p): state %x\n", __func__, hdmi, info->state);
 
@@ -1156,7 +1151,7 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work)
                                  */
                                 info->var.width = hdmi->var.width;
                                 info->var.height = hdmi->var.height;
-                                sh_hdmi_display_on(&hdmi->entity, info);
+                                sh_hdmi_display_on(&hdmi->entity);
                         } else {
                                 /* New monitor or have to wake up */
                                 fb_set_suspend(info, 0);
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index 1ecc71ec41ff..03ee3826fb62 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -338,7 +338,7 @@ static void sh_mobile_lcdc_display_on(struct sh_mobile_lcdc_chan *ch)
         struct sh_mobile_lcdc_panel_cfg *panel = &ch->cfg.panel_cfg;
 
         if (ch->tx_dev) {
-                if (ch->tx_dev->ops->display_on(ch->tx_dev, ch->info) < 0)
+                if (ch->tx_dev->ops->display_on(ch->tx_dev) < 0)
                         return;
         }
 
diff --git a/drivers/video/sh_mobile_lcdcfb.h b/drivers/video/sh_mobile_lcdcfb.h
index 36cd5649598b..b2cb8e6d098c 100644
--- a/drivers/video/sh_mobile_lcdcfb.h
+++ b/drivers/video/sh_mobile_lcdcfb.h
@@ -23,8 +23,7 @@ struct sh_mobile_lcdc_chan;
 
 struct sh_mobile_lcdc_entity_ops {
         /* Display */
-        int (*display_on)(struct sh_mobile_lcdc_entity *entity,
-                          struct fb_info *info);
+        int (*display_on)(struct sh_mobile_lcdc_entity *entity);
         void (*display_off)(struct sh_mobile_lcdc_entity *entity);
 };