| From 751759a33255eba913de232c981a99802dca7b67 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 17 Jan 2017 10:28:51 +0200 |
| Subject: [PATCH 236/255] 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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Reviewed-by: Jose Abreu <joabreu@synopsys.com> |
| Signed-off-by: Archit Taneja <architt@codeaurora.org> |
| Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-2-laurent.pinchart+renesas@ideasonboard.com |
| (cherry picked from commit cc7e96232763ff33418b088b436a564441347b15) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpu/drm/bridge/dw-hdmi.c | 9 +-------- |
| 1 file changed, 1 insertion(+), 8 deletions(-) |
| |
| --- a/drivers/gpu/drm/bridge/dw-hdmi.c |
| +++ b/drivers/gpu/drm/bridge/dw-hdmi.c |
| @@ -868,7 +868,7 @@ static bool hdmi_phy_wait_i2c_done(struc |
| 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 |
| 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, |
