]> git.baikalelectronics.ru Git - kernel.git/commit
net: usb: sr9700: Use 'SR_' prefix for the common register macros
authorChen Gang <gang.chen@sunrus.com.cn>
Mon, 2 Feb 2015 21:00:40 +0000 (05:00 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 4 Feb 2015 21:53:02 +0000 (13:53 -0800)
commit5b5692de7fc6641da130538afec27720b2c2dcdf
tree8c812a63001e2e8d100a1416952fcd60885930ed
parentad3560f10435b4f0e90ac68188e5a3adf43b7e2c
net: usb: sr9700: Use 'SR_' prefix for the common register macros

The commone register macors (e.g. RSR) is too commont to drivers, it may
be conflict with the architectures (e.g. xtensa, sh).

The related warnings (with allmodconfig under xtensa):

    CC [M]  drivers/net/usb/sr9700.o
  In file included from drivers/net/usb/sr9700.c:24:0:
  drivers/net/usb/sr9700.h:65:0: warning: "RSR" redefined
   #define RSR   0x06
   ^
  In file included from ./arch/xtensa/include/asm/bitops.h:22:0,
                   from include/linux/bitops.h:36,
                   from include/linux/kernel.h:10,
                   from include/linux/list.h:8,
                   from include/linux/module.h:9,
                   from drivers/net/usb/sr9700.c:13:
  ./arch/xtensa/include/asm/processor.h:190:0: note: this is the location of the previous definition
   #define RSR(v,sr) __asm__ __volatile__ ("rsr %0,"__stringify(sr) : "=a"(v));
   ^

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/sr9700.c
drivers/net/usb/sr9700.h