diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-28 22:42:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 19:46:26 -0500 |
commit | 674979d33566ab7e524e25fdc227923e27a3fb78 (patch) | |
tree | 5f4dbf65b4153c90145d6feb0f23894c3ea0d587 /drivers/net/sfc/falcon.c | |
parent | 39e60212087a36a53daca3904563012ccaf6e92d (diff) |
sfc: Remove duplicate hardware structure definitions
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/falcon.c')
-rw-r--r-- | drivers/net/sfc/falcon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index b7e9238aaec4..08f540f072b8 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) | |||
1463 | /* Determine interrupting queues, clear interrupt status | 1463 | /* Determine interrupting queues, clear interrupt status |
1464 | * register and acknowledge the device interrupt. | 1464 | * register and acknowledge the device interrupt. |
1465 | */ | 1465 | */ |
1466 | BUILD_BUG_ON(INT_EVQS_WIDTH > EFX_MAX_CHANNELS); | 1466 | BUILD_BUG_ON(FSF_AZ_NET_IVEC_INT_Q_WIDTH > EFX_MAX_CHANNELS); |
1467 | queues = EFX_OWORD_FIELD(*int_ker, INT_EVQS); | 1467 | queues = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_INT_Q); |
1468 | EFX_ZERO_OWORD(*int_ker); | 1468 | EFX_ZERO_OWORD(*int_ker); |
1469 | wmb(); /* Ensure the vector is cleared before interrupt ack */ | 1469 | wmb(); /* Ensure the vector is cleared before interrupt ack */ |
1470 | falcon_irq_ack_a1(efx); | 1470 | falcon_irq_ack_a1(efx); |
@@ -1500,7 +1500,7 @@ static irqreturn_t falcon_msi_interrupt(int irq, void *dev_id) | |||
1500 | irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker)); | 1500 | irq, raw_smp_processor_id(), EFX_OWORD_VAL(*int_ker)); |
1501 | 1501 | ||
1502 | /* Check to see if we have a serious error condition */ | 1502 | /* Check to see if we have a serious error condition */ |
1503 | syserr = EFX_OWORD_FIELD(*int_ker, FATAL_INT); | 1503 | syserr = EFX_OWORD_FIELD(*int_ker, FSF_AZ_NET_IVEC_FATAL_INT); |
1504 | if (unlikely(syserr)) | 1504 | if (unlikely(syserr)) |
1505 | return falcon_fatal_interrupt(efx); | 1505 | return falcon_fatal_interrupt(efx); |
1506 | 1506 | ||