lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: et131x: tx ring mac error is only used as a local

Browse Source 
So make it a local

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox
2009-10-06 15:50:05 +01:00
committed by Greg Kroah-Hartman
parent 1458d82b45
commit ceef1a5e0e
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/et131x/et1310_tx.h
View File

@@ -143,9 +143,7 @@ struct tx_ring {
u32 *tx_status; u32 *tx_status;
dma_addr_t tx_status_pa; dma_addr_t tx_status_pa;
TXMAC_ERR_t TxMacErr; /* Packets since the last IRQ: used for interrupt coalescing */
/* Variables to track the Tx interrupt coalescing features */
int since_irq; int since_irq;
}; };

5
drivers/staging/et131x/et131x_isr.c
View File

@@ -397,8 +397,7 @@ void et131x_isr_handler(struct work_struct *work)
/* Let's move on to the TxMac */ /* Let's move on to the TxMac */
if (status & ET_INTR_TXMAC) { if (status & ET_INTR_TXMAC) {
etdev->tx_ring.TxMacErr.value = u32 err = readl(&iomem->txmac.err.value);
readl(&iomem->txmac.err.value);
/* /*
* When any of the errors occur and TXMAC generates * 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, dev_warn(&etdev->pdev->dev,
"TXMAC interrupt, error 0x%08x\n", "TXMAC interrupt, error 0x%08x\n",
etdev->tx_ring.TxMacErr.value); err);
/* If we are debugging, we want to see this error, /* If we are debugging, we want to see this error,
* otherwise we just want the device to be reset and * otherwise we just want the device to be reset and