lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: et131x: kill the loopback type

Browse Source 
Kill off the loopback type in the driver

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
2009-08-27 11:02:43 +01:00
committed by Greg Kroah-Hartman
parent e266b20222
commit bc7f9c597f
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,23 +139,11 @@
#define ET_MSI_TC 0x00070000 #define ET_MSI_TC 0x00070000
/* /*
* structure for Loopback reg in global address map * Loopback reg located at address 0x0034
* located at address 0x0034
*/ */
typedef union _LOOPBACK_t {
u32 value; #define ET_LOOP_MAC 0x00000001
struct { #define ET_LOOP_DMA 0x00000002
#ifdef _BIT_FIELDS_HTOL
u32 unused:30; /* bits 2-31 */
u32 dma_loopback:1; /* bit 1 */
u32 mac_loopback:1; /* bit 0 */
#else
u32 mac_loopback:1; /* bit 0 */
u32 dma_loopback:1; /* bit 1 */
u32 unused:30; /* bits 2-31 */
#endif
} bits;
} LOOPBACK_t, *PLOOPBACK_t;
/* /*
* GLOBAL Module of JAGCore Address Mapping * GLOBAL Module of JAGCore Address Mapping
@@ -175,7 +163,7 @@ typedef struct _GLOBAL_t { /* Location: */
u32 sw_reset; /* 0x0028 */ u32 sw_reset; /* 0x0028 */
u32 slv_timer; /* 0x002C */ u32 slv_timer; /* 0x002C */
u32 msi_config; /* 0x0030 */ u32 msi_config; /* 0x0030 */
LOOPBACK_t loopback; /* 0x0034 */ u32 loopback; /* 0x0034 */
u32 watchdog_timer; /* 0x0038 */ u32 watchdog_timer; /* 0x0038 */
} GLOBAL_t, *PGLOBAL_t; } GLOBAL_t, *PGLOBAL_t;

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

@@ -573,7 +573,7 @@ void ConfigGlobalRegs(struct et131x_adapter *etdev)
} }
/* Initialize the loopback register. Disable all loopbacks. */ /* Initialize the loopback register. Disable all loopbacks. */
writel(0, &regs->loopback.value); writel(0, &regs->loopback);
} else { } else {
/* For PHY Line loopback, the memory is configured as if Tx /* For PHY Line loopback, the memory is configured as if Tx
* and Rx both have all the memory. This is because the * and Rx both have all the memory. This is because the
@@ -586,7 +586,7 @@ void ConfigGlobalRegs(struct et131x_adapter *etdev)
writel(INTERNAL_MEM_SIZE - 1, &regs->txq_end_addr); writel(INTERNAL_MEM_SIZE - 1, &regs->txq_end_addr);
/* Initialize the loopback register (MAC loopback). */ /* Initialize the loopback register (MAC loopback). */
writel(1, &regs->loopback); writel(ET_LOOP_MAC, &regs->loopback);
} }
/* MSI Register */ /* MSI Register */