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>
This commit is contained in:
Laurent Pinchart 2011-09-18 12:26:50 +02:00
parent bce95fe838
commit 5864ace19a
4 changed files with 6 additions and 13 deletions

View file

@ -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;

View file

@ -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);

View file

@ -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;
}

View file

@ -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);
};