smc91x: Kill off excessive versatile hooks.
PATCH 1/1 smc91x: Kill off excessive versatile hooks.
This looks like a result of too many auto-merges. The CONFIG_ARCH_VERSATILE case was handled a total of 6 times. This kills 5 of them.
Signed-off-by Paul Mundt <[email protected]>
--
drivers/net/smc91x.h | 90 --------------------------------------------------- 1 file changed, 90 deletions(-)
drivers/net/smc91x.h +0 -90
@@ -362,96 +362,6 @@ static inline void LPD7_SMC_outsw (unsig#define SMC_IRQ_FLAGS (0) -#elif defined(CONFIG_ARCH_VERSATILE ) - -#define SMC_CAN_USE_8BIT 1 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 1 -#define SMC_NOWAIT 1 - -#define SMC_inb (a, r) readb((a) + (r)) -#define SMC_inw (a, r) readw((a) + (r)) -#define SMC_inl (a, r) readl((a) + (r)) -#define SMC_outb (v, a, r) writeb(v, (a) + (r)) -#define SMC_outw (v, a, r) writew(v, (a) + (r)) -#define SMC_outl (v, a, r) writel(v, (a) + (r)) -#define SMC_insl (a, r, p, l) readsl((a) + (r), p, l) -#define SMC_outsl (a, r, p, l) writesl((a) + (r), p, l) - -#define SMC_IRQ_FLAGS (0) - -#elif defined(CONFIG_ARCH_VERSATILE ) - -#define SMC_CAN_USE_8BIT 1 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 1 -#define SMC_NOWAIT 1 - -#define SMC_inb (a, r) readb((a) + (r)) -#define SMC_inw (a, r) readw((a) + (r)) -#define SMC_inl (a, r) readl((a) + (r)) -#define SMC_outb (v, a, r) writeb(v, (a) + (r)) -#define SMC_outw (v, a, r) writew(v, (a) + (r)) -#define SMC_outl (v, a, r) writel(v, (a) + (r)) -#define SMC_insl (a, r, p, l) readsl((a) + (r), p, l) -#define SMC_outsl (a, r, p, l) writesl((a) + (r), p, l) - -#define SMC_IRQ_FLAGS (0) - -#elif defined(CONFIG_ARCH_VERSATILE ) - -#define SMC_CAN_USE_8BIT 1 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 1 -#define SMC_NOWAIT 1 - -#define SMC_inb (a, r) readb((a) + (r)) -#define SMC_inw (a, r) readw((a) + (r)) -#define SMC_inl (a, r) readl((a) + (r)) -#define SMC_outb (v, a, r) writeb(v, (a) + (r)) -#define SMC_outw (v, a, r) writew(v, (a) + (r)) -#define SMC_outl (v, a, r) writel(v, (a) + (r)) -#define SMC_insl (a, r, p, l) readsl((a) + (r), p, l) -#define SMC_outsl (a, r, p, l) writesl((a) + (r), p, l) - -#define SMC_IRQ_FLAGS (0) - -#elif defined(CONFIG_ARCH_VERSATILE ) - -#define SMC_CAN_USE_8BIT 1 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 1 -#define SMC_NOWAIT 1 - -#define SMC_inb (a, r) readb((a) + (r)) -#define SMC_inw (a, r) readw((a) + (r)) -#define SMC_inl (a, r) readl((a) + (r)) -#define SMC_outb (v, a, r) writeb(v, (a) + (r)) -#define SMC_outw (v, a, r) writew(v, (a) + (r)) -#define SMC_outl (v, a, r) writel(v, (a) + (r)) -#define SMC_insl (a, r, p, l) readsl((a) + (r), p, l) -#define SMC_outsl (a, r, p, l) writesl((a) + (r), p, l) - -#define SMC_IRQ_FLAGS (0) - -#elif defined(CONFIG_ARCH_VERSATILE ) - -#define SMC_CAN_USE_8BIT 1 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 1 -#define SMC_NOWAIT 1 - -#define SMC_inb (a, r) readb((a) + (r)) -#define SMC_inw (a, r) readw((a) + (r)) -#define SMC_inl (a, r) readl((a) + (r)) -#define SMC_outb (v, a, r) writeb(v, (a) + (r)) -#define SMC_outw (v, a, r) writew(v, (a) + (r)) -#define SMC_outl (v, a, r) writel(v, (a) + (r)) -#define SMC_insl (a, r, p, l) readsl((a) + (r), p, l) -#define SMC_outsl (a, r, p, l) writesl((a) + (r), p, l) - -#define SMC_IRQ_FLAGS (0) -#else #define SMC_CAN_USE_8BIT 1
Jeff Garzik
AppliedQuoted 5 lines · Paul Mundt
This looks like a result of too many auto-merges. The
CONFIG_ARCH_VERSATILEcase was handled a total of 6 times. This kills 5 of them.Signed-off-by Paul Mundt <[email protected]>
applied