Skip to content

Commit cb2a091

Browse files
Zongdong Jiaoakiernan
authored andcommitted
hdmitx: fix dead code and bad sizeof
PD#150078: driver defect clean up: torvalds#14 torvalds#89 torvalds#111 torvalds#124 torvalds#133 torvalds#136 torvalds#137 torvalds#146 torvalds#148 torvalds#150 torvalds#153 Change-Id: I734a66a8b92a0dc57a232879463a3fc074534fa0 Signed-off-by: Zongdong Jiao <[email protected]>
1 parent e7b989c commit cb2a091

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_edid.c

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -198,32 +198,12 @@ void Edid_DecodeStandardTiming(struct hdmitx_info *info,
198198

199199
frame_rate = (int)((Data[i*2 + 1]) & 0x3F) + 60;
200200

201-
if ((hor_pixel == 720) && (frame_rate == 30))
202-
info->hdmi_sup_480i = 1;
203-
else if ((hor_pixel == 720) && (frame_rate == 25))
204-
info->hdmi_sup_576i = 1;
205-
else if ((hor_pixel == 720) && (frame_rate == 60))
201+
if ((hor_pixel == 720) && (frame_rate == 60))
206202
info->hdmi_sup_480p = 1;
207-
else if ((hor_pixel == 720) && (frame_rate == 50))
208-
info->hdmi_sup_576p = 1;
209203
else if ((hor_pixel == 1280) && (frame_rate == 60))
210204
info->hdmi_sup_720p_60hz = 1;
211-
else if ((hor_pixel == 1280) && (frame_rate == 50))
212-
info->hdmi_sup_720p_50hz = 1;
213-
else if ((hor_pixel == 1920) && (frame_rate == 30))
214-
info->hdmi_sup_1080i_60hz = 1;
215-
else if ((hor_pixel == 1920) && (frame_rate == 25))
216-
info->hdmi_sup_1080i_50hz = 1;
217205
else if ((hor_pixel == 1920) && (frame_rate == 60))
218206
info->hdmi_sup_1080p_60hz = 1;
219-
else if ((hor_pixel == 1920) && (frame_rate == 50))
220-
info->hdmi_sup_1080p_50hz = 1;
221-
else if ((hor_pixel == 1920) && (frame_rate == 24))
222-
info->hdmi_sup_1080p_24hz = 1;
223-
else if ((hor_pixel == 1920) && (frame_rate == 25))
224-
info->hdmi_sup_1080p_25hz = 1;
225-
else if ((hor_pixel == 1920) && (frame_rate == 30))
226-
info->hdmi_sup_1080p_30hz = 1;
227207
}
228208
}
229209
}
@@ -2350,7 +2330,7 @@ static void hdmitx_edid_blk_print(unsigned char *blk, unsigned int blk_idx)
23502330
if (!tmp_buf)
23512331
return;
23522332

2353-
memset(tmp_buf, 0, sizeof(TMP_EDID_BUF_SIZE));
2333+
memset(tmp_buf, 0, TMP_EDID_BUF_SIZE);
23542334
hdmi_print(INF, EDID "blk%d raw data\n", blk_idx);
23552335
for (i = 0, pos = 0; i < 128; i++) {
23562336
pos += sprintf(tmp_buf + pos, "%02x", blk[i]);

0 commit comments

Comments
 (0)