diff options
| author |   Alan Cox <alan@linux.intel.com> | 2009-08-27 11:03:29 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:29 -0700 |
| commit | fba84166978c334f90593d4f1d6e1309c029a097 (patch) | |
| tree | c979f7bfbe476bd760176ec48b24e5e372e0da83 /drivers/staging/et131x | |
| parent | Staging: et131x: re-order the initpci code to match usual Linux style (diff) | |
| download | linux-dev-fba84166978c334f90593d4f1d6e1309c029a097.tar.xz linux-dev-fba84166978c334f90593d4f1d6e1309c029a097.zip | |
Staging: et131x: kill off the TXDMA error type
This isn't actually used properly anyway
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_address_map.h | 35 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x_isr.c | 6 |
2 files changed, 10 insertions, 31 deletions
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h index 39ba922bd2b6..6c69a15dbbe5 100644 --- a/drivers/staging/et131x/et1310_address_map.h +++ b/drivers/staging/et131x/et1310_address_map.h @@ -261,35 +261,14 @@ extern inline void add_10bit(u32 *v, int n) * txdma tx descriptor cache write index reg in txdma address map at 0x1030 * * txdma error reg in txdma address map at address 0x1034 + * 0: PyldResend + * 1: PyldRewind + * 4: DescrResend + * 5: DescrRewind + * 8: WrbkResend + * 9: WrbkRewind */ -typedef union _TXDMA_ERROR_t { - u32 value; - struct { -#ifdef _BIT_FIELDS_HTOL - u32 unused3:22; /* bits 10-31 */ - u32 WrbkRewind:1; /* bit 9 */ - u32 WrbkResend:1; /* bit 8 */ - u32 unused2:2; /* bits 6-7 */ - u32 DescrRewind:1; /* bit 5 */ - u32 DescrResend:1; /* bit 4 */ - u32 unused1:2; /* bits 2-3 */ - u32 PyldRewind:1; /* bit 1 */ - u32 PyldResend:1; /* bit 0 */ -#else - u32 PyldResend:1; /* bit 0 */ - u32 PyldRewind:1; /* bit 1 */ - u32 unused1:2; /* bits 2-3 */ - u32 DescrResend:1; /* bit 4 */ - u32 DescrRewind:1; /* bit 5 */ - u32 unused2:2; /* bits 6-7 */ - u32 WrbkResend:1; /* bit 8 */ - u32 WrbkRewind:1; /* bit 9 */ - u32 unused3:22; /* bits 10-31 */ -#endif - } bits; -} TXDMA_ERROR_t, *PTXDMA_ERROR_t; - /* * Tx DMA Module of JAGCore Address Mapping * Located at address 0x1000 @@ -308,7 +287,7 @@ typedef struct _TXDMA_t { /* Location: */ u32 service_complete; /* 0x1028 */ u32 cache_rd_index; /* 0x102C */ u32 cache_wr_index; /* 0x1030 */ - TXDMA_ERROR_t TxDmaError; /* 0x1034 */ + u32 TxDmaError; /* 0x1034 */ u32 DescAbortCount; /* 0x1038 */ u32 PayloadAbortCnt; /* 0x103c */ u32 WriteBackAbortCnt; /* 0x1040 */ diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c index 2943178a7a36..f80189d7cb6d 100644 --- a/drivers/staging/et131x/et131x_isr.c +++ b/drivers/staging/et131x/et131x_isr.c @@ -255,14 +255,14 @@ void et131x_isr_handler(struct work_struct *work) if (status) { /* Handle the TXDMA Error interrupt */ if (status & ET_INTR_TXDMA_ERR) { - TXDMA_ERROR_t TxDmaErr; + u32 txdma_err; /* Following read also clears the register (COR) */ - TxDmaErr.value = readl(&iomem->txdma.TxDmaError.value); + txdma_err = readl(&iomem->txdma.TxDmaError); dev_warn(&etdev->pdev->dev, "TXDMA_ERR interrupt, error = %d\n", - TxDmaErr.value); + txdma_err); } /* Handle Free Buffer Ring 0 and 1 Low interrupt */ |