Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
media: aspeed: Use FIELD_GET to improve readability
Use the bitfield macro FIELD_GET, and GENMASK to do the shift and mask in
one go for reg values.
Signed-off-by: Jammy Huang <jammy_huang@aspeedtech.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
authored by
Jammy Huang
and committed by
Mauro Carvalho Chehab
26aea93b
4b732a00
+12
-19
+12
-19
drivers/media/platform/aspeed-video.c
+12
-19
drivers/media/platform/aspeed-video.c
···
144
144
#define VE_SRC_LR_EDGE_DET_NO_H BIT(13)
145
145
#define VE_SRC_LR_EDGE_DET_NO_DISP BIT(14)
146
146
#define VE_SRC_LR_EDGE_DET_NO_CLK BIT(15)
147
-
#define VE_SRC_LR_EDGE_DET_RT_SHF 16
148
-
#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, VE_SRC_LR_EDGE_DET_RT_SHF)
147
+
#define VE_SRC_LR_EDGE_DET_RT GENMASK(27, 16)
149
148
#define VE_SRC_LR_EDGE_DET_INTERLACE BIT(31)
150
149
151
150
#define VE_SRC_TB_EDGE_DET 0x094
152
151
#define VE_SRC_TB_EDGE_DET_TOP GENMASK(12, 0)
153
-
#define VE_SRC_TB_EDGE_DET_BOT_SHF 16
154
-
#define VE_SRC_TB_EDGE_DET_BOT GENMASK(28, VE_SRC_TB_EDGE_DET_BOT_SHF)
152
+
#define VE_SRC_TB_EDGE_DET_BOT GENMASK(28, 16)
155
153
156
154
#define VE_MODE_DETECT_STATUS 0x098
157
155
#define VE_MODE_DETECT_H_PERIOD GENMASK(11, 0)
158
-
#define VE_MODE_DETECT_V_LINES_SHF 16
159
-
#define VE_MODE_DETECT_V_LINES GENMASK(27, VE_MODE_DETECT_V_LINES_SHF)
156
+
#define VE_MODE_DETECT_V_LINES GENMASK(27, 16)
160
157
#define VE_MODE_DETECT_STATUS_VSYNC BIT(28)
161
158
#define VE_MODE_DETECT_STATUS_HSYNC BIT(29)
162
159
163
160
#define VE_SYNC_STATUS 0x09c
164
161
#define VE_SYNC_STATUS_HSYNC GENMASK(11, 0)
165
-
#define VE_SYNC_STATUS_VSYNC_SHF 16
166
-
#define VE_SYNC_STATUS_VSYNC GENMASK(27, VE_SYNC_STATUS_VSYNC_SHF)
162
+
#define VE_SYNC_STATUS_VSYNC GENMASK(27, 16)
167
163
168
164
#define VE_H_TOTAL_PIXELS 0x0A0
169
165
···
862
866
sync = aspeed_video_read(video, VE_SYNC_STATUS);
863
867
htotal = aspeed_video_read(video, VE_H_TOTAL_PIXELS);
864
868
865
-
video->frame_bottom = (src_tb_edge & VE_SRC_TB_EDGE_DET_BOT) >>
866
-
VE_SRC_TB_EDGE_DET_BOT_SHF;
867
-
video->frame_top = src_tb_edge & VE_SRC_TB_EDGE_DET_TOP;
869
+
video->frame_bottom = FIELD_GET(VE_SRC_TB_EDGE_DET_BOT, src_tb_edge);
870
+
video->frame_top = FIELD_GET(VE_SRC_TB_EDGE_DET_TOP, src_tb_edge);
868
871
det->vfrontporch = video->frame_top;
869
-
det->vbackporch = ((mds & VE_MODE_DETECT_V_LINES) >>
870
-
VE_MODE_DETECT_V_LINES_SHF) - video->frame_bottom;
871
-
det->vsync = (sync & VE_SYNC_STATUS_VSYNC) >>
872
-
VE_SYNC_STATUS_VSYNC_SHF;
872
+
det->vbackporch = FIELD_GET(VE_MODE_DETECT_V_LINES, mds) -
873
+
video->frame_bottom;
874
+
det->vsync = FIELD_GET(VE_SYNC_STATUS_VSYNC, sync);
873
875
if (video->frame_top > video->frame_bottom)
874
876
continue;
875
877
876
-
video->frame_right = (src_lr_edge & VE_SRC_LR_EDGE_DET_RT) >>
877
-
VE_SRC_LR_EDGE_DET_RT_SHF;
878
-
video->frame_left = src_lr_edge & VE_SRC_LR_EDGE_DET_LEFT;
878
+
video->frame_right = FIELD_GET(VE_SRC_LR_EDGE_DET_RT, src_lr_edge);
879
+
video->frame_left = FIELD_GET(VE_SRC_LR_EDGE_DET_LEFT, src_lr_edge);
879
880
det->hfrontporch = video->frame_left;
880
881
det->hbackporch = htotal - video->frame_right;
881
-
det->hsync = sync & VE_SYNC_STATUS_HSYNC;
882
+
det->hsync = FIELD_GET(VE_SYNC_STATUS_HSYNC, sync);
882
883
if (video->frame_left > video->frame_right)
883
884
continue;
884
885