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

Commit cc7e9623 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Archit Taneja
Browse files

drm: bridge: dw-hdmi: Merge __hdmi_phy_i2c_write and hdmi_phy_i2c_write 



The latter is just an int wrapper around the former void function that
unconditionally returns 0. As the return value is never checked, merge
the two functions into one.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarJose Abreu <joabreu@synopsys.com>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-2-laurent.pinchart+renesas@ideasonboard.com
parent 8e945cba

drivers/gpu/drm/bridge/dw-hdmi.c

+1 −8
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ static bool hdmi_phy_wait_i2c_done(struct dw_hdmi *hdmi, int msec) 
	return true;

}



static void __hdmi_phy_i2c_write(struct dw_hdmi *hdmi, unsigned short data,

static void hdmi_phy_i2c_write(struct dw_hdmi *hdmi, unsigned short data,

				 unsigned char addr)

{

	hdmi_writeb(hdmi, 0xFF, HDMI_IH_I2CMPHY_STAT0);
@@ -882,13 +882,6 @@ static void __hdmi_phy_i2c_write(struct dw_hdmi *hdmi, unsigned short data, 
	hdmi_phy_wait_i2c_done(hdmi, 1000);

}



static int hdmi_phy_i2c_write(struct dw_hdmi *hdmi, unsigned short data,

			      unsigned char addr)

{

	__hdmi_phy_i2c_write(hdmi, data, addr);

	return 0;

}



static void dw_hdmi_phy_enable_powerdown(struct dw_hdmi *hdmi, bool enable)

{

	hdmi_mask_writeb(hdmi, !enable, HDMI_PHY_CONF0,