[PATCH 212/235] Staging: et131x: kill TxMacTest field
Greg Kroah-Hartman
gregkh at suse.de
Fri Dec 11 22:29:14 UTC 2009
From: Alan Cox <alan at linux.intel.com>
It's really a local in the interrupt handler
Signed-off-by: Alan Cox <alan at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/et131x/et131x_adapter.h | 3 ---
drivers/staging/et131x/et131x_isr.c | 3 +--
2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index ed35f8a..3f7f37a 100644
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/drivers/staging/et131x/et131x_adapter.h
@@ -213,9 +213,6 @@ struct et131x_adapter {
u32 MCAddressCount;
u8 MCList[NIC_MAX_MCAST_LIST][ETH_ALEN];
- /* MAC test */
- u32 TxMacTest;
-
/* Pointer to the device's PCI register space */
ADDRESS_MAP_t __iomem *regs;
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c
index 486abe4..3aeac7b 100644
--- a/drivers/staging/et131x/et131x_isr.c
+++ b/drivers/staging/et131x/et131x_isr.c
@@ -337,10 +337,9 @@ void et131x_isr_handler(struct work_struct *work)
*/
/* TRAP();*/
- etdev->TxMacTest = readl(&iomem->txmac.tx_test);
dev_warn(&etdev->pdev->dev,
"RxDMA_ERR interrupt, error %x\n",
- etdev->TxMacTest);
+ readl(&iomem->txmac.tx_test));
}
/* Handle the Wake on LAN Event */
--
1.6.5.5
More information about the devel
mailing list