| Message ID | 1453353151-4622-1-git-send-email-sudipm.mukherjee@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> Date: Thu, 21 Jan 2016 10:42:31 +0530 > The defconfig build of blackfin is failing with the error: > > arch/blackfin/include/asm/bfin_serial.h:269:0: warning: "port_membase" redefined > drivers/net/irda/bfin_sir.h:85:0: note: this is the location of the previous definition > arch/blackfin/include/asm/bfin_serial.h:382:0: warning: "get_lsr_cache" redefined > drivers/net/irda/bfin_sir.h:86:0: note: this is the location of the previous definition > arch/blackfin/include/asm/bfin_serial.h:383:0: warning: "put_lsr_cache" redefined > drivers/net/irda/bfin_sir.h:87:0: note: this is the location of the previous definition > > port_membase, get_lsr_cache, put_lsr_cache are already defined in the > architecture files, no need to define them again in the driver. > > Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Applied, thank you.
diff --git a/drivers/net/irda/bfin_sir.h b/drivers/net/irda/bfin_sir.h index 29cbde8..d47cf14 100644 --- a/drivers/net/irda/bfin_sir.h +++ b/drivers/net/irda/bfin_sir.h @@ -82,9 +82,6 @@ struct bfin_sir_self { #define DRIVER_NAME "bfin_sir" -#define port_membase(port) (((struct bfin_sir_port *)(port))->membase) -#define get_lsr_cache(port) (((struct bfin_sir_port *)(port))->lsr) -#define put_lsr_cache(port, v) (((struct bfin_sir_port *)(port))->lsr = (v)) #include <asm/bfin_serial.h> static const unsigned short per[][4] = {
The defconfig build of blackfin is failing with the error: arch/blackfin/include/asm/bfin_serial.h:269:0: warning: "port_membase" redefined drivers/net/irda/bfin_sir.h:85:0: note: this is the location of the previous definition arch/blackfin/include/asm/bfin_serial.h:382:0: warning: "get_lsr_cache" redefined drivers/net/irda/bfin_sir.h:86:0: note: this is the location of the previous definition arch/blackfin/include/asm/bfin_serial.h:383:0: warning: "put_lsr_cache" redefined drivers/net/irda/bfin_sir.h:87:0: note: this is the location of the previous definition port_membase, get_lsr_cache, put_lsr_cache are already defined in the architecture files, no need to define them again in the driver. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> --- drivers/net/irda/bfin_sir.h | 3 --- 1 file changed, 3 deletions(-)