diff options
| author | Eric Miao <eric.miao@marvell.com> | 2008-06-19 11:19:57 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 22:52:40 +0200 |
| commit | fa6d3be08538bb80274d20c7e59f9beca48fa44a (patch) | |
| tree | 9f5df8e61bac1138d971d323472f2d4fbf3ca87b /drivers/net/smc91x.h | |
| parent | [NET] smc91x: remove "irq_flags" from "struct smc91x_platdata" (diff) | |
| download | linux-fa6d3be08538bb80274d20c7e59f9beca48fa44a.tar.xz linux-fa6d3be08538bb80274d20c7e59f9beca48fa44a.zip | |
[NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_*
Let's simplify the logic and avoid confusion, the use of SMC91X_USE_*
is favored than SMC_CAN_USE_*, if platform data isn't given, convert
the hardcoded SMC_CAN_USE_* to SMC91X_USE_*.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/net/smc91x.h')
| -rw-r--r-- | drivers/net/smc91x.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 8606818653f8..8310f1a073d8 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -454,7 +454,6 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, #define RPC_LSA_DEFAULT RPC_LED_100_10 #define RPC_LSB_DEFAULT RPC_LED_TX_RX -#define SMC_DYNAMIC_BUS_CONFIG #endif @@ -504,15 +503,9 @@ struct smc_local { struct smc91x_platdata cfg; }; -#ifdef SMC_DYNAMIC_BUS_CONFIG -#define SMC_8BIT(p) (((p)->cfg.flags & SMC91X_USE_8BIT) && SMC_CAN_USE_8BIT) -#define SMC_16BIT(p) (((p)->cfg.flags & SMC91X_USE_16BIT) && SMC_CAN_USE_16BIT) -#define SMC_32BIT(p) (((p)->cfg.flags & SMC91X_USE_32BIT) && SMC_CAN_USE_32BIT) -#else -#define SMC_8BIT(p) SMC_CAN_USE_8BIT -#define SMC_16BIT(p) SMC_CAN_USE_16BIT -#define SMC_32BIT(p) SMC_CAN_USE_32BIT -#endif +#define SMC_8BIT(p) ((p)->cfg.flags & SMC91X_USE_8BIT) +#define SMC_16BIT(p) ((p)->cfg.flags & SMC91X_USE_16BIT) +#define SMC_32BIT(p) ((p)->cfg.flags & SMC91X_USE_32BIT) #ifdef SMC_USE_PXA_DMA /* |