tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[media] tef6862: fix warning on avr32 arch
On avr32 arch, we get those warnings:
drivers/media/radio/tef6862.c:59:1: warning: "MODE_SHIFT" redefined
In file included from /devel/v4l/ktest-build/arch/avr32/include/asm/ptrace.h:11,
arch/avr32/include/uapi/asm/ptrace.h:41:1: warning: this is the location of the previous definition
Prefix MSA_ to the MSA register bitmap macros, to avoid reusing the same symbol.
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+10
-10
+10
-10
drivers/media/radio/tef6862.c
+10
-10
drivers/media/radio/tef6862.c
···
48
48
#define WM_SUB_TEST 0xF
49
49
50
50
/* Different modes of the MSA register */
51
-
#define MODE_BUFFER 0x0
52
-
#define MODE_PRESET 0x1
53
-
#define MODE_SEARCH 0x2
54
-
#define MODE_AF_UPDATE 0x3
55
-
#define MODE_JUMP 0x4
56
-
#define MODE_CHECK 0x5
57
-
#define MODE_LOAD 0x6
58
-
#define MODE_END 0x7
59
-
#define MODE_SHIFT 5
51
+
#define MSA_MODE_BUFFER 0x0
52
+
#define MSA_MODE_PRESET 0x1
53
+
#define MSA_MODE_SEARCH 0x2
54
+
#define MSA_MODE_AF_UPDATE 0x3
55
+
#define MSA_MODE_JUMP 0x4
56
+
#define MSA_MODE_CHECK 0x5
57
+
#define MSA_MODE_LOAD 0x6
58
+
#define MSA_MODE_END 0x7
59
+
#define MSA_MODE_SHIFT 5
60
60
61
61
struct tef6862_state {
62
62
struct v4l2_subdev sd;
···
114
114
115
115
clamp(freq, TEF6862_LO_FREQ, TEF6862_HI_FREQ);
116
116
pll = 1964 + ((freq - TEF6862_LO_FREQ) * 20) / FREQ_MUL;
117
-
i2cmsg[0] = (MODE_PRESET << MODE_SHIFT) | WM_SUB_PLLM;
117
+
i2cmsg[0] = (MSA_MODE_PRESET << MSA_MODE_SHIFT) | WM_SUB_PLLM;
118
118
i2cmsg[1] = (pll >> 8) & 0xff;
119
119
i2cmsg[2] = pll & 0xff;
120
120