aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/net_driver.h
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/net_driver.h
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/net_driver.h')
-rw-r--r--drivers/net/sfc/net_driver.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h
index 390275710ef4..1fa134ab8eb8 100644
--- a/drivers/net/sfc/net_driver.h
+++ b/drivers/net/sfc/net_driver.h
@@ -329,7 +329,6 @@ enum efx_rx_alloc_method {
329 * @used_flags: Channel is used by net driver 329 * @used_flags: Channel is used by net driver
330 * @enabled: Channel enabled indicator 330 * @enabled: Channel enabled indicator
331 * @irq: IRQ number (MSI and MSI-X only) 331 * @irq: IRQ number (MSI and MSI-X only)
332 * @has_interrupt: Channel has an interrupt
333 * @irq_moderation: IRQ moderation value (in us) 332 * @irq_moderation: IRQ moderation value (in us)
334 * @napi_dev: Net device used with NAPI 333 * @napi_dev: Net device used with NAPI
335 * @napi_str: NAPI control structure 334 * @napi_str: NAPI control structure
@@ -361,7 +360,6 @@ struct efx_channel {
361 int used_flags; 360 int used_flags;
362 bool enabled; 361 bool enabled;
363 int irq; 362 int irq;
364 bool has_interrupt;
365 unsigned int irq_moderation; 363 unsigned int irq_moderation;
366 struct net_device *napi_dev; 364 struct net_device *napi_dev;
367 struct napi_struct napi_str; 365 struct napi_struct napi_str;
@@ -834,15 +832,6 @@ struct efx_nic_type {
834 continue; \ 832 continue; \
835 else 833 else
836 834
837/* Iterate over all used channels with interrupts */
838#define efx_for_each_channel_with_interrupt(_channel, _efx) \
839 for (_channel = &_efx->channel[0]; \
840 _channel < &_efx->channel[EFX_MAX_CHANNELS]; \
841 _channel++) \
842 if (!(_channel->used_flags && _channel->has_interrupt)) \
843 continue; \
844 else
845
846/* Iterate over all used TX queues */ 835/* Iterate over all used TX queues */
847#define efx_for_each_tx_queue(_tx_queue, _efx) \ 836#define efx_for_each_tx_queue(_tx_queue, _efx) \
848 for (_tx_queue = &_efx->tx_queue[0]; \ 837 for (_tx_queue = &_efx->tx_queue[0]; \