diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-10-06 15:50:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 12:23:07 -0800 |
| commit | ceef1a5e0ebc3418c8dbd8644195cce3bcb6949f (patch) | |
| tree | c43fdc6d0645992922c99111df453cf25e82f1f2 /drivers/staging/et131x | |
| 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/et131x')
| -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 60bb2c8a3063..4f0ea81978f5 100644 --- a/drivers/staging/et131x/et1310_tx.h +++ b/drivers/staging/et131x/et1310_tx.h @@ -143,9 +143,7 @@ struct tx_ring { u32 *tx_status; dma_addr_t tx_status_pa; - TXMAC_ERR_t TxMacErr; - - /* Variables to track the Tx interrupt coalescing features */ + /* Packets since the last IRQ: used for interrupt coalescing */ int since_irq; }; diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c index b6dab8c76993..ccd9bc22e185 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) /* Let's move on to the TxMac */ if (status & ET_INTR_TXMAC) { - etdev->tx_ring.TxMacErr.value = - readl(&iomem->txmac.err.value); + u32 err = readl(&iomem->txmac.err.value); /* * When any of the errors occur and TXMAC generates @@ -412,7 +411,7 @@ void et131x_isr_handler(struct work_struct *work) */ dev_warn(&etdev->pdev->dev, "TXMAC interrupt, error 0x%08x\n", - etdev->tx_ring.TxMacErr.value); + err); /* If we are debugging, we want to see this error, * otherwise we just want the device to be reset and |