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>

diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h
index f121961339c1ed6baaea1bbc8c58c2b82380f6c6..16254b7603a1c7b9f38d2ab95a04f9272071b5c0 100644 (file)
--- 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 0892b6a538dbe7c734f2d2b2c86a82e8f93a5022..e02b1cd98f552ca21e4af20dd30c9bca0fd58813 100644 (file)
--- 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, &regs->rxq_start_addr);
        writel(INTERNAL_MEM_SIZE - 1, &regs->txq_end_addr);