From: Zheng Yang <zhengyang@rock-chips.com>
Date: Wed, 12 Aug 2015 01:35:53 +0000 (+0800)
Subject: hdmi:cec: Define cec send frame return value.
X-Git-Tag: firefly_0821_release~3853
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=16a94e1eeff88f441873032f222010bae0892e0a;p=firefly-linux-kernel-4.4.55.git

hdmi:cec: Define cec send frame return value.

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>
---

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.h b/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.h
index 4a55841a4c78..81bfe4734263 100644
--- a/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.h
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmi-cec.h
@@ -124,6 +124,12 @@ enum {
 	EVENT_ENUMERATE,
 };
 
+enum {
+	CEC_SEND_SUCCESS = 0,
+	CEC_SEND_NACK,
+	CEC_SEND_BUSY
+};
+
 #define MAKE_SRCDEST(src, dest)    ((src << 4) | dest)
 
 #define MAX_CMD_SIZE 16
diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv1/rockchip_hdmiv1_cec.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv1/rockchip_hdmiv1_cec.c
index 1cc59ac65c09..b9c7db7c7b5b 100644
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv1/rockchip_hdmiv1_cec.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv1/rockchip_hdmiv1_cec.c
@@ -64,7 +64,7 @@ static int rockchip_hdmiv1_cec_send_frame(struct hdmi *hdmi,
 	if (wait_event_interruptible_timeout(cec.wait,
 					     cec.busfree == 0,
 					     msecs_to_jiffies(17)))
-		return -1;
+		return CEC_SEND_BUSY;
 
 	CECDBG("end wait bus free,start tx,busfree=%d\n", cec.busfree);
 	/*Start TX*/
@@ -78,9 +78,9 @@ static int rockchip_hdmiv1_cec_send_frame(struct hdmi *hdmi,
 
 	if (cec.tx_done == 1) {
 		cec.tx_done = 0;
-		return 0;
+		return CEC_SEND_SUCCESS;
 	} else {
-		return -1;
+		return CEC_SEND_NACK;
 	}
 }
 
diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_cec.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_cec.c
index bda139bee932..b35526e40adc 100644
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_cec.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_cec.c
@@ -91,11 +91,11 @@ static int rockchip_hdmiv2_cec_sendframe(struct hdmi *hdmi,
 	}
 	CECDBG("%s interrupt 0x%02x\n", __func__, interrupt);
 	if (interrupt & m_DONE)
-		return 0;
+		return CEC_SEND_SUCCESS;
 	else if (interrupt & m_NACK)
-		return 1;
+		return CEC_SEND_NACK;
 	else
-		return  -1;
+		return CEC_SEND_BUSY;
 }
 
 void rockchip_hdmiv2_cec_init(struct hdmi *hdmi)