Commit 099c736a authored by Linus Torvalds's avatar Linus Torvalds

Revert "smc91x: fix build breakage from the SMC_GET_MAC_ADDR API upgrade"

This reverts commit 9e6db608, which was
merged without the API it needed, causing build breakage.
Reported-by: default avatarBryan Wu <cooloney@kernel.org>
Acked-by: default avatarJeff Garzik <jgarzik@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 950b0d28
...@@ -92,14 +92,14 @@ ...@@ -92,14 +92,14 @@
#define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l) #define SMC_insw(a, r, p, l) insw ((unsigned long *)((a) + (r)), p, l)
# endif # endif
/* check if the mac in reg is valid */ /* check if the mac in reg is valid */
#define SMC_GET_MAC_ADDR(lp, addr) \ #define SMC_GET_MAC_ADDR(addr) \
do { \ do { \
unsigned int __v; \ unsigned int __v; \
__v = SMC_inw(ioaddr, ADDR0_REG(lp)); \ __v = SMC_inw(ioaddr, ADDR0_REG); \
addr[0] = __v; addr[1] = __v >> 8; \ addr[0] = __v; addr[1] = __v >> 8; \
__v = SMC_inw(ioaddr, ADDR1_REG(lp)); \ __v = SMC_inw(ioaddr, ADDR1_REG); \
addr[2] = __v; addr[3] = __v >> 8; \ addr[2] = __v; addr[3] = __v >> 8; \
__v = SMC_inw(ioaddr, ADDR2_REG(lp)); \ __v = SMC_inw(ioaddr, ADDR2_REG); \
addr[4] = __v; addr[5] = __v >> 8; \ addr[4] = __v; addr[5] = __v >> 8; \
if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \ if (*(u32 *)(&addr[0]) == 0xFFFFFFFF) { \
random_ether_addr(addr); \ random_ether_addr(addr); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment