leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: et131x: Kill off the rxdma type

Browse Source 
We have a clean struct of this now so turn the top level typedefs into a
struct

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 2010-01-18 15:33:01 +00:00 committed by Greg Kroah-Hartman
parent 1bd751c1ab
commit 61d5ed8c62
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/et131x/et1310_address_map.h
View File

@ -500,7 +500,7 @@ typedef struct _TXDMA_t { /* Location: */
* Rx DMA Module of JAGCore Address Mapping
* Located at address 0x2000
*/
typedef struct _RXDMA_t { /* Location: */
struct rxdma_regs { /* Location: */
u32 csr; /* 0x2000 */
u32 dma_wb_base_lo; /* 0x2004 */
u32 dma_wb_base_hi; /* 0x2008 */
@ -530,7 +530,7 @@ typedef struct _RXDMA_t { /* Location: */
u32 fbr1_full_offset; /* 0x2068 */
u32 fbr1_rd_index; /* 0x206C */
u32 fbr1_min_des; /* 0x2070 */
} RXDMA_t, *PRXDMA_t;
};
/* END OF RXDMA REGISTER ADDRESS MAP */
@ -1688,9 +1688,9 @@ typedef struct _ADDRESS_MAP_t {
TXDMA_t txdma;
/* unused section of txdma address map */
u8 unused_txdma[4096 - sizeof(TXDMA_t)];
RXDMA_t rxdma;
struct rxdma_regs rxdma;
/* unused section of rxdma address map */
u8 unused_rxdma[4096 - sizeof(RXDMA_t)];
u8 unused_rxdma[4096 - sizeof(struct rxdma_regs)];
TXMAC_t txmac;
/* unused section of txmac address map */
u8 unused_txmac[4096 - sizeof(TXMAC_t)];

4
drivers/staging/et131x/et1310_rx.c
View File

@ -593,7 +593,7 @@ int et131x_init_recv(struct et131x_adapter *adapter)
*/
void ConfigRxDmaRegs(struct et131x_adapter *etdev)
{
struct _RXDMA_t __iomem *rx_dma = &etdev->regs->rxdma;
struct rxdma_regs __iomem *rx_dma = &etdev->regs->rxdma;
struct _rx_ring_t *rx_local = &etdev->RxRing;
struct fbr_desc *fbr_entry;
u32 entry;
@ -1097,7 +1097,7 @@ static inline u32 bump_fbr(u32 *fbr, u32 limit)
void nic_return_rfd(struct et131x_adapter *etdev, PMP_RFD rfd)
{
struct _rx_ring_t *rx_local = &etdev->RxRing;
struct _RXDMA_t __iomem *rx_dma = &etdev->regs->rxdma;
struct rxdma_regs __iomem *rx_dma = &etdev->regs->rxdma;
uint16_t bi = rfd->bufferindex;
uint8_t ri = rfd->ringindex;
unsigned long flags;