Message ID | adba61f63f4439ac17f2e428429f01ae5e65ab15.1279110895.git.siccegge@cs.fau.de |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, 14 Jul 2010, Christoph Egger wrote: > REDWOOD_{5,6} doesn't exist in Kconfig, therefore removing all > references for it from the source code. > > Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Acked-by: Nicolas Pitre <nico@fluxnic.net> > --- > drivers/net/smc91x.h | 37 ------------------------------------- > 1 files changed, 0 insertions(+), 37 deletions(-) > > diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h > index 8d2772c..ee74791 100644 > --- a/drivers/net/smc91x.h > +++ b/drivers/net/smc91x.h > @@ -83,43 +83,6 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) > } > } > > -#elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6) > - > -/* We can only do 16-bit reads and writes in the static memory space. */ > -#define SMC_CAN_USE_8BIT 0 > -#define SMC_CAN_USE_16BIT 1 > -#define SMC_CAN_USE_32BIT 0 > -#define SMC_NOWAIT 1 > - > -#define SMC_IO_SHIFT 0 > - > -#define SMC_inw(a, r) in_be16((volatile u16 *)((a) + (r))) > -#define SMC_outw(v, a, r) out_be16((volatile u16 *)((a) + (r)), v) > -#define SMC_insw(a, r, p, l) \ > - do { \ > - unsigned long __port = (a) + (r); \ > - u16 *__p = (u16 *)(p); \ > - int __l = (l); \ > - insw(__port, __p, __l); \ > - while (__l > 0) { \ > - *__p = swab16(*__p); \ > - __p++; \ > - __l--; \ > - } \ > - } while (0) > -#define SMC_outsw(a, r, p, l) \ > - do { \ > - unsigned long __port = (a) + (r); \ > - u16 *__p = (u16 *)(p); \ > - int __l = (l); \ > - while (__l > 0) { \ > - /* Believe it or not, the swab isn't needed. */ \ > - outw( /* swab16 */ (*__p++), __port); \ > - __l--; \ > - } \ > - } while (0) > -#define SMC_IRQ_FLAGS (0) > - > #elif defined(CONFIG_SA1100_PLEB) > /* We can only do 16-bit reads and writes in the static memory space. */ > #define SMC_CAN_USE_8BIT 1 > -- > 1.7.0.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Christoph Egger <siccegge@cs.fau.de> Date: Wed, 14 Jul 2010 14:41:31 +0200 > REDWOOD_{5,6} doesn't exist in Kconfig, therefore removing all > references for it from the source code. > > Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Again, if you're going to kill this off you should also delete the references in drivers/net/Kconfig at the same time. Please fix this up and resubmit your patch, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 8d2772c..ee74791 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -83,43 +83,6 @@ static inline void SMC_outw(u16 val, void __iomem *ioaddr, int reg) } } -#elif defined(CONFIG_REDWOOD_5) || defined(CONFIG_REDWOOD_6) - -/* We can only do 16-bit reads and writes in the static memory space. */ -#define SMC_CAN_USE_8BIT 0 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 0 -#define SMC_NOWAIT 1 - -#define SMC_IO_SHIFT 0 - -#define SMC_inw(a, r) in_be16((volatile u16 *)((a) + (r))) -#define SMC_outw(v, a, r) out_be16((volatile u16 *)((a) + (r)), v) -#define SMC_insw(a, r, p, l) \ - do { \ - unsigned long __port = (a) + (r); \ - u16 *__p = (u16 *)(p); \ - int __l = (l); \ - insw(__port, __p, __l); \ - while (__l > 0) { \ - *__p = swab16(*__p); \ - __p++; \ - __l--; \ - } \ - } while (0) -#define SMC_outsw(a, r, p, l) \ - do { \ - unsigned long __port = (a) + (r); \ - u16 *__p = (u16 *)(p); \ - int __l = (l); \ - while (__l > 0) { \ - /* Believe it or not, the swab isn't needed. */ \ - outw( /* swab16 */ (*__p++), __port); \ - __l--; \ - } \ - } while (0) -#define SMC_IRQ_FLAGS (0) - #elif defined(CONFIG_SA1100_PLEB) /* We can only do 16-bit reads and writes in the static memory space. */ #define SMC_CAN_USE_8BIT 1
REDWOOD_{5,6} doesn't exist in Kconfig, therefore removing all references for it from the source code. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> --- drivers/net/smc91x.h | 37 ------------------------------------- 1 files changed, 0 insertions(+), 37 deletions(-)