Gitweb: http://git.kernel.org/linus/fef5ba3ae9760fdc2688b7160fa056e7ef2700bb
Commit: fef5ba3ae9760fdc2688b7160fa056e7ef2700bb
Parent: dcb0789bb344b76fdeb32876f1e498a5cd19ecc1
Author: Alan Cox <alan@linux.intel.com>
AuthorDate: Mon Jan 18 15:35:24 2010 +0000
Committer: Greg Kroah-Hartman <gregkh@suse.de>
CommitDate: Wed Mar 3 16:42:52 2010 -0800
Staging: et131x: kill the rxmac ERROR_REG_t
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/staging/et131x/et1310_address_map.h | 26 +++++++-------------------
drivers/staging/et131x/et131x_isr.c | 2 +-
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h
index e571093..5f6a7b5 100644
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -892,25 +892,13 @@ typedef union _RXMAC_UNI_PF_ADDR3_t {
/*
* structure for Error reg in rxmac address map.
* located at address 0x409C
+ *
+ * 31-4: unused
+ * 3: mif
+ * 2: async
+ * 1: pkt_filter
+ * 0: mcif
*/
-typedef union _RXMAC_ERROR_REG_t {
- u32 value;
- struct {
-#ifdef _BIT_FIELDS_HTOL
- u32 reserve:28; /* bits 4-31 */
- u32 mif:1; /* bit 3 */
- u32 async:1; /* bit 2 */
- u32 pkt_filter:1; /* bit 1 */
- u32 mcif:1; /* bit 0 */
-#else
- u32 mcif:1; /* bit 0 */
- u32 pkt_filter:1; /* bit 1 */
- u32 async:1; /* bit 2 */
- u32 mif:1; /* bit 3 */
- u32 reserve:28; /* bits 4-31 */
-#endif
- } bits;
-} RXMAC_ERROR_REG_t, *PRXMAC_ERROR_REG_t;
/*
* Rx MAC Module of JAGCore Address Mapping
@@ -956,7 +944,7 @@ typedef struct _RXMAC_t { /* Location: */
u32 space_avail; /* 0x4094 */
u32 mif_ctrl; /* 0x4098 */
- RXMAC_ERROR_REG_t err_reg; /* 0x409C */
+ u32 err_reg; /* 0x409C */
} RXMAC_t, *PRXMAC_t;
/* END OF RXMAC REGISTER ADDRESS MAP */
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c
index 5ff8665..87c8de6 100644
--- a/drivers/staging/et131x/et131x_isr.c
+++ b/drivers/staging/et131x/et131x_isr.c
@@ -441,7 +441,7 @@ void et131x_isr_handler(struct work_struct *work)
dev_warn(&etdev->pdev->dev,
"RXMAC interrupt, error 0x%08x. Requesting reset\n",
- readl(&iomem->rxmac.err_reg.value));
+ readl(&iomem->rxmac.err_reg));
dev_warn(&etdev->pdev->dev,
"Enable 0x%08x, Diag 0x%08x\n",
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
