diff options
author | Alan Cox <alan@linux.intel.com> | 2009-10-06 10:50:05 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:23:07 -0500 |
commit | ceef1a5e0ebc3418c8dbd8644195cce3bcb6949f (patch) | |
tree | c43fdc6d0645992922c99111df453cf25e82f1f2 /drivers/staging | |
parent | 1458d82b459198b16805eca54877ef16204cd33c (diff) |
Staging: et131x: tx ring mac error is only used as a local
So make it a local
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/et131x/et1310_tx.h | 4 | ||||
-rw-r--r-- | drivers/staging/et131x/et131x_isr.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/staging/et131x/et1310_tx.h b/drivers/staging/et131x/et1310_tx.h index 60bb2c8a306..4f0ea81978f 100644 --- a/drivers/staging/et131x/et1310_tx.h +++ b/drivers/staging/et131x/et1310_tx.h | |||
@@ -143,9 +143,7 @@ struct tx_ring { | |||
143 | u32 *tx_status; | 143 | u32 *tx_status; |
144 | dma_addr_t tx_status_pa; | 144 | dma_addr_t tx_status_pa; |
145 | 145 | ||
146 | TXMAC_ERR_t TxMacErr; | 146 | /* Packets since the last IRQ: used for interrupt coalescing */ |
147 | |||
148 | /* Variables to track the Tx interrupt coalescing features */ | ||
149 | int since_irq; | 147 | int since_irq; |
150 | }; | 148 | }; |
151 | 149 | ||
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c index b6dab8c7699..ccd9bc22e18 100644 --- a/drivers/staging/et131x/et131x_isr.c +++ b/drivers/staging/et131x/et131x_isr.c | |||
@@ -397,8 +397,7 @@ void et131x_isr_handler(struct work_struct *work) | |||
397 | 397 | ||
398 | /* Let's move on to the TxMac */ | 398 | /* Let's move on to the TxMac */ |
399 | if (status & ET_INTR_TXMAC) { | 399 | if (status & ET_INTR_TXMAC) { |
400 | etdev->tx_ring.TxMacErr.value = | 400 | u32 err = readl(&iomem->txmac.err.value); |
401 | readl(&iomem->txmac.err.value); | ||
402 | 401 | ||
403 | /* | 402 | /* |
404 | * When any of the errors occur and TXMAC generates | 403 | * When any of the errors occur and TXMAC generates |
@@ -412,7 +411,7 @@ void et131x_isr_handler(struct work_struct *work) | |||
412 | */ | 411 | */ |
413 | dev_warn(&etdev->pdev->dev, | 412 | dev_warn(&etdev->pdev->dev, |
414 | "TXMAC interrupt, error 0x%08x\n", | 413 | "TXMAC interrupt, error 0x%08x\n", |
415 | etdev->tx_ring.TxMacErr.value); | 414 | err); |
416 | 415 | ||
417 | /* If we are debugging, we want to see this error, | 416 | /* If we are debugging, we want to see this error, |
418 | * otherwise we just want the device to be reset and | 417 | * otherwise we just want the device to be reset and |