aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/falcon.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2008-09-01 07:47:38 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-09-03 09:53:46 -0400
commit64ee3120f73b9e904d97ba66386b1e8e93b81385 (patch)
treed529e4e4597b654922a74130330c0c9e197037da /drivers/net/sfc/falcon.c
parent46123d043d4bab23aa0d22f33972ee52cfac7f68 (diff)
sfc: Remove efx_channel::has_interrupt
efx_channel::has_interrupt is redundant with efx_channel::used_flags. Remove efx_test_eventq() because it is now obviously unreachable. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/sfc/falcon.c')
-rw-r--r--drivers/net/sfc/falcon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index 30176390481c..40dd643e930d 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -1317,7 +1317,7 @@ void falcon_enable_interrupts(struct efx_nic *efx)
1317 1317
1318 /* Force processing of all the channels to get the EVQ RPTRs up to 1318 /* Force processing of all the channels to get the EVQ RPTRs up to
1319 date */ 1319 date */
1320 efx_for_each_channel_with_interrupt(channel, efx) 1320 efx_for_each_channel(channel, efx)
1321 efx_schedule_channel(channel); 1321 efx_schedule_channel(channel);
1322} 1322}
1323 1323
@@ -1567,7 +1567,7 @@ int falcon_init_interrupt(struct efx_nic *efx)
1567 } 1567 }
1568 1568
1569 /* Hook MSI or MSI-X interrupt */ 1569 /* Hook MSI or MSI-X interrupt */
1570 efx_for_each_channel_with_interrupt(channel, efx) { 1570 efx_for_each_channel(channel, efx) {
1571 rc = request_irq(channel->irq, falcon_msi_interrupt, 1571 rc = request_irq(channel->irq, falcon_msi_interrupt,
1572 IRQF_PROBE_SHARED, /* Not shared */ 1572 IRQF_PROBE_SHARED, /* Not shared */
1573 efx->name, channel); 1573 efx->name, channel);
@@ -1580,7 +1580,7 @@ int falcon_init_interrupt(struct efx_nic *efx)
1580 return 0; 1580 return 0;
1581 1581
1582 fail2: 1582 fail2:
1583 efx_for_each_channel_with_interrupt(channel, efx) 1583 efx_for_each_channel(channel, efx)
1584 free_irq(channel->irq, channel); 1584 free_irq(channel->irq, channel);
1585 fail1: 1585 fail1:
1586 return rc; 1586 return rc;
@@ -1592,7 +1592,7 @@ void falcon_fini_interrupt(struct efx_nic *efx)
1592 efx_oword_t reg; 1592 efx_oword_t reg;
1593 1593
1594 /* Disable MSI/MSI-X interrupts */ 1594 /* Disable MSI/MSI-X interrupts */
1595 efx_for_each_channel_with_interrupt(channel, efx) { 1595 efx_for_each_channel(channel, efx) {
1596 if (channel->irq) 1596 if (channel->irq)
1597 free_irq(channel->irq, channel); 1597 free_irq(channel->irq, channel);
1598 } 1598 }