diff options
| author |   Alan Cox <alan@linux.intel.com> | 2010-01-18 15:33:12 +0000 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 16:42:49 -0800 |
| commit | 2b903327d34a48250da3f559a8906f3a55db9901 (patch) | |
| tree | 077bf2b6d5b69d71258c2a469ff2cc558f82dd41 /drivers/staging/et131x | |
| parent | Staging: et131x: kill EXP_ROM (diff) | |
| download | linux-dev-2b903327d34a48250da3f559a8906f3a55db9901.tar.xz linux-dev-2b903327d34a48250da3f559a8906f3a55db9901.zip | |
Staging: et131x: GLOBAL_t is now sane so kill the GLOBAL_t itself
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 | 10 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x_initpci.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h index f121961339c1..16254b7603a1 100644 --- a/drivers/staging/et131x/et1310_address_map.h +++ b/drivers/staging/et131x/et1310_address_map.h @@ -149,7 +149,7 @@ * GLOBAL Module of JAGCore Address Mapping * Located at address 0x0000 */ -typedef struct _GLOBAL_t { /* Location: */ +struct global_regs { /* Location: */ u32 txq_start_addr; /* 0x0000 */ u32 txq_end_addr; /* 0x0004 */ u32 rxq_start_addr; /* 0x0008 */ @@ -165,9 +165,7 @@ typedef struct _GLOBAL_t { /* Location: */ u32 msi_config; /* 0x0030 */ u32 loopback; /* 0x0034 */ u32 watchdog_timer; /* 0x0038 */ -} GLOBAL_t, *PGLOBAL_t; - -/* END OF GLOBAL REGISTER ADDRESS MAP */ +}; /* START OF TXDMA REGISTER ADDRESS MAP */ @@ -1666,9 +1664,9 @@ typedef struct _MMC_t { /* Location: */ * JAGCore Address Mapping */ typedef struct _ADDRESS_MAP_t { - GLOBAL_t global; + struct global_regs global; /* unused section of global address map */ - u8 unused_global[4096 - sizeof(GLOBAL_t)]; + u8 unused_global[4096 - sizeof(struct global_regs)]; TXDMA_t txdma; /* unused section of txdma address map */ u8 unused_txdma[4096 - sizeof(TXDMA_t)]; diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index 0892b6a538db..e02b1cd98f55 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -327,7 +327,7 @@ void et131x_link_detection_handler(unsigned long data) */ void ConfigGlobalRegs(struct et131x_adapter *etdev) { - struct _GLOBAL_t __iomem *regs = &etdev->regs->global; + struct global_regs __iomem *regs = &etdev->regs->global; writel(0, ®s->rxq_start_addr); writel(INTERNAL_MEM_SIZE - 1, ®s->txq_end_addr); |