diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-09-18 06:26:50 -0400 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-03-12 17:40:51 -0400 |
commit | 5864ace19a2546912308e94432c1cf52d5945afe (patch) | |
tree | bc8e9e3fecfef8f9cdea0c4720ddd2e18da0bf46 /drivers/video/sh_mobile_hdmi.c | |
parent | bce95fe838a5ca84e57411338b953be672c2a5eb (diff) |
fbdev: sh_mobile_lcdc: Remove fb_info parameter to display_on operation
The parameter is unused, remove it.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'drivers/video/sh_mobile_hdmi.c')
-rw-r--r-- | drivers/video/sh_mobile_hdmi.c | 11 |
1 files changed, 3 insertions, 8 deletions
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) | |||
1000 | return IRQ_HANDLED; | 1000 | return IRQ_HANDLED; |
1001 | } | 1001 | } |
1002 | 1002 | ||
1003 | /* locking: called with info->lock held, or before register_framebuffer() */ | 1003 | static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity) |
1004 | static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity, | ||
1005 | struct fb_info *info) | ||
1006 | { | 1004 | { |
1007 | /* | ||
1008 | * info is guaranteed to be valid, when we are called, because our | ||
1009 | * FB_EVENT_FB_UNBIND notify is also called with info->lock held | ||
1010 | */ | ||
1011 | struct sh_hdmi *hdmi = entity_to_sh_hdmi(entity); | 1005 | struct sh_hdmi *hdmi = entity_to_sh_hdmi(entity); |
1012 | struct sh_mobile_lcdc_chan *ch = entity->lcdc; | 1006 | struct sh_mobile_lcdc_chan *ch = entity->lcdc; |
1007 | struct fb_info *info = ch->info; | ||
1013 | 1008 | ||
1014 | dev_dbg(hdmi->dev, "%s(%p): state %x\n", __func__, hdmi, info->state); | 1009 | dev_dbg(hdmi->dev, "%s(%p): state %x\n", __func__, hdmi, info->state); |
1015 | 1010 | ||
@@ -1156,7 +1151,7 @@ static void sh_hdmi_edid_work_fn(struct work_struct *work) | |||
1156 | */ | 1151 | */ |
1157 | info->var.width = hdmi->var.width; | 1152 | info->var.width = hdmi->var.width; |
1158 | info->var.height = hdmi->var.height; | 1153 | info->var.height = hdmi->var.height; |
1159 | sh_hdmi_display_on(&hdmi->entity, info); | 1154 | sh_hdmi_display_on(&hdmi->entity); |
1160 | } else { | 1155 | } else { |
1161 | /* New monitor or have to wake up */ | 1156 | /* New monitor or have to wake up */ |
1162 | fb_set_suspend(info, 0); | 1157 | fb_set_suspend(info, 0); |