From: Kieran Bingham Date: Tue, 17 Jan 2017 08:28:53 +0000 (+0200) Subject: UPSTREAM: drm: bridge: dw-hdmi: Remove unused function parameter X-Git-Tag: release-20171130_firefly~4^2~722 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=09db7120f9af4412e31cb670c64eea201f9d406d;p=firefly-linux-kernel-4.4.55.git UPSTREAM: drm: bridge: dw-hdmi: Remove unused function parameter The 'prep' parameter passed to hdmi_phy_configure() is useless. It is hardcoded as 0, and if set, simply prevents the configure function from executing. Remove it. Signed-off-by: Kieran Bingham Signed-off-by: Laurent Pinchart Reviewed-by: Jose Abreu Signed-off-by: Archit Taneja Link: http://patchwork.freedesktop.org/patch/msgid/20170117082910.27023-4-laurent.pinchart+renesas@ideasonboard.com Change-Id: Iff93b8a109d5540283f8ad39ef25ce2fd79acb2a Signed-off-by: Zheng Yang (cherry pick from dfa73065d61b6ce57aed90bb0d745c4b6f5b71e7) --- diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index 5b4fa45b5903..9f822a7ac8d7 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -1182,7 +1182,7 @@ static void dw_hdmi_phy_sel_interface_control(struct dw_hdmi *hdmi, u8 enable) HDMI_PHY_CONF0_SELDIPIF_MASK); } -static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep, +static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char res, int cscon) { unsigned res_idx; @@ -1192,9 +1192,6 @@ static int hdmi_phy_configure(struct dw_hdmi *hdmi, unsigned char prep, const struct dw_hdmi_curr_ctrl *curr_ctrl = pdata->cur_ctr; const struct dw_hdmi_phy_config *phy_config = pdata->phy_config; - if (prep) - return -EINVAL; - switch (res) { case 0: /* color resolution 0 is 8 bit colour depth */ case 8: @@ -1348,7 +1345,7 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi) dw_hdmi_phy_enable_powerdown(hdmi, true); /* Enable CSC */ - ret = hdmi_phy_configure(hdmi, 0, 8, cscon); + ret = hdmi_phy_configure(hdmi, 8, cscon); if (ret) return ret; }