Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ceb6560a authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by David S. Miller
Browse files

net/irda: bfin_sir: remove duplicate defines 



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: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8034e1ef

drivers/net/irda/bfin_sir.h

+0 −3
Original line number Diff line number Diff line
@@ -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] = {