mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-27 17:21:34 +00:00
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 4d69de06ed2934b45c0e6b2a5056ef2a7caa0b9a 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 11/93] 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
|
|
---
|
|
drivers/gpu/drm/bridge/dw-hdmi.c | 9 +--------
|
|
1 file changed, 1 insertion(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c
|
|
index f5009ae..a668550 100644
|
|
--- 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(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,
|
|
--
|
|
1.9.1
|
|
|