Skip to content

Commit

Permalink
[media] tef6862: fix warning on avr32 arch
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mauro Carvalho Chehab committed Nov 7, 2013
1 parent 1d212cf commit 5f27ca4
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/media/radio/tef6862.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
#define WM_SUB_TEST 0xF

/* Different modes of the MSA register */
#define MODE_BUFFER 0x0
#define MODE_PRESET 0x1
#define MODE_SEARCH 0x2
#define MODE_AF_UPDATE 0x3
#define MODE_JUMP 0x4
#define MODE_CHECK 0x5
#define MODE_LOAD 0x6
#define MODE_END 0x7
#define MODE_SHIFT 5
#define MSA_MODE_BUFFER 0x0
#define MSA_MODE_PRESET 0x1
#define MSA_MODE_SEARCH 0x2
#define MSA_MODE_AF_UPDATE 0x3
#define MSA_MODE_JUMP 0x4
#define MSA_MODE_CHECK 0x5
#define MSA_MODE_LOAD 0x6
#define MSA_MODE_END 0x7
#define MSA_MODE_SHIFT 5

struct tef6862_state {
struct v4l2_subdev sd;
Expand Down Expand Up @@ -114,7 +114,7 @@ static int tef6862_s_frequency(struct v4l2_subdev *sd, const struct v4l2_frequen

clamp(freq, TEF6862_LO_FREQ, TEF6862_HI_FREQ);
pll = 1964 + ((freq - TEF6862_LO_FREQ) * 20) / FREQ_MUL;
i2cmsg[0] = (MODE_PRESET << MODE_SHIFT) | WM_SUB_PLLM;
i2cmsg[0] = (MSA_MODE_PRESET << MSA_MODE_SHIFT) | WM_SUB_PLLM;
i2cmsg[1] = (pll >> 8) & 0xff;
i2cmsg[2] = pll & 0xff;

Expand Down

0 comments on commit 5f27ca4

Please sign in to comment.