diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-29 03:42:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-29 16:46:26 -0800 |
| commit | 674979d33566ab7e524e25fdc227923e27a3fb78 (patch) | |
| tree | 5f4dbf65b4153c90145d6feb0f23894c3ea0d587 | |
| parent | 39e60212087a36a53daca3904563012ccaf6e92d (diff) | |
| download | kernel_samsung_smdk4412-674979d33566ab7e524e25fdc227923e27a3fb78.zip kernel_samsung_smdk4412-674979d33566ab7e524e25fdc227923e27a3fb78.tar.gz kernel_samsung_smdk4412-674979d33566ab7e524e25fdc227923e27a3fb78.tar.bz2 | |
sfc: Remove duplicate hardware structure definitions
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/sfc/falcon.c | 6 | ||||
| -rw-r--r-- | drivers/net/sfc/regs.h | 12 |
2 files changed, 3 insertions, 15 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index b7e9238..08f540f 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -1463,8 +1463,8 @@ static irqreturn_t falcon_legacy_interrupt_a1(int irq, void *dev_id) /* Determine interrupting queues, clear interrupt status * register and acknowledge the device interrupt. */ - BUILD_BUG_ON(INT_EVQS_WIDTH > EFX_MAX_CHANNELS); - queues = EFX_OWORD_FIELD(*int_ker, INT_EVQS); + BUILD_BUG_ON(FSF_AZ_NET_IVEC_INT_Q_WIDTH > EFX_MAX_CHANNELS); + queues = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_INT_Q); EFX_ZERO_OWORD(*int_ker); wmb(); /* Ensure the vector is cleared before interrupt ack */ falcon_irq_ack_a1(efx); @@ -1500,7 +1500,7 @@ static irqreturn_t falcon_msi_interrupt(int irq, void *dev_id) irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker)); /* Check to see if we have a serious error condition */ - syserr = EFX_OWORD_FIELD(*int_ker, FATAL_INT); + syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT); if (unlikely(syserr)) return falcon_fatal_interrupt(efx); diff --git a/drivers/net/sfc/regs.h b/drivers/net/sfc/regs.h index f336d83..89d606f 100644 --- a/drivers/net/sfc/regs.h +++ b/drivers/net/sfc/regs.h @@ -3106,18 +3106,6 @@ #define FALCON_STATS_NOT_DONE 0x00000000 #define FALCON_STATS_DONE 0xffffffff -/* Interrupt status register bits */ -#define FATAL_INT_LBN 64 -#define FATAL_INT_WIDTH 1 -#define INT_EVQS_LBN 40 -#define INT_EVQS_WIDTH 4 -#define INT_FLAG_LBN 32 -#define INT_FLAG_WIDTH 1 -#define EVQ_FIFO_HF_LBN 1 -#define EVQ_FIFO_HF_WIDTH 1 -#define EVQ_FIFO_AF_LBN 0 -#define EVQ_FIFO_AF_WIDTH 1 - /************************************************************************** * * Falcon non-volatile configuration |