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>
git-mirror · Dec 11, 2009 · ceef1a5 · ceef1a5
1 parent 1458d82
commit ceef1a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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