Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5864ace1 authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

fbdev: sh_mobile_lcdc: Remove fb_info parameter to display_on operation 



The parameter is unused, remove it.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent bce95fe8

drivers/video/sh_mipi_dsi.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -394,8 +394,7 @@ static int __init sh_mipi_setup(struct sh_mipi *mipi, 
	return 0;

	return 0;

}

}





static int mipi_display_on(struct sh_mobile_lcdc_entity *entity,

static int mipi_display_on(struct sh_mobile_lcdc_entity *entity)

			   struct fb_info *info)

{

{

	struct sh_mipi *mipi = to_sh_mipi(entity);

	struct sh_mipi *mipi = to_sh_mipi(entity);

	struct sh_mipi_dsi_info *pdata = mipi->pdev->dev.platform_data;

	struct sh_mipi_dsi_info *pdata = mipi->pdev->dev.platform_data;

drivers/video/sh_mobile_hdmi.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -1000,16 +1000,11 @@ static irqreturn_t sh_hdmi_hotplug(int irq, void *dev_id) 
	return IRQ_HANDLED;

	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)

static int sh_hdmi_display_on(struct sh_mobile_lcdc_entity *entity,

			      struct fb_info *info)

{

{

	/*

	 * 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_hdmi *hdmi = entity_to_sh_hdmi(entity);

	struct sh_mobile_lcdc_chan *ch = entity->lcdc;

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

	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.width = hdmi->var.width;

				info->var.height = hdmi->var.height;

				info->var.height = hdmi->var.height;

				sh_hdmi_display_on(&hdmi->entity, info);

				sh_hdmi_display_on(&hdmi->entity);

			} else {

			} else {

				/* New monitor or have to wake up */

				/* New monitor or have to wake up */

				fb_set_suspend(info, 0);

				fb_set_suspend(info, 0);

drivers/video/sh_mobile_lcdcfb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

	struct sh_mobile_lcdc_panel_cfg *panel = &ch->cfg.panel_cfg;





	if (ch->tx_dev) {

	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;

			return;

	}

	}

drivers/video/sh_mobile_lcdcfb.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -23,8 +23,7 @@ struct sh_mobile_lcdc_chan; 




struct sh_mobile_lcdc_entity_ops {

struct sh_mobile_lcdc_entity_ops {

	/* Display */

	/* Display */

	int (*display_on)(struct sh_mobile_lcdc_entity *entity,

	int (*display_on)(struct sh_mobile_lcdc_entity *entity);

			  struct fb_info *info);

	void (*display_off)(struct sh_mobile_lcdc_entity *entity);

	void (*display_off)(struct sh_mobile_lcdc_entity *entity);

};

};