diff options
| author |   Alan Cox <alan@linux.intel.com> | 2009-08-27 11:00:47 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:28 -0700 |
| commit | 576b38e0cd5ab57af1c84312b0b14d77090dbeda (patch) | |
| tree | 09dbd195bf5ba006fb3abd24dd1a3650375eb95b /drivers/staging/et131x | |
| parent | Staging: et131x: de-hungarianise a bit (diff) | |
| download | linux-dev-576b38e0cd5ab57af1c84312b0b14d77090dbeda.tar.xz linux-dev-576b38e0cd5ab57af1c84312b0b14d77090dbeda.zip | |
Staging: et131x: continue pruning unused fields
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_jagcore.h | 19 | ||||
| -rw-r--r-- | drivers/staging/et131x/et1310_phy.c | 2 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x_adapter.h | 4 |
3 files changed, 1 insertions, 24 deletions
diff --git a/drivers/staging/et131x/et1310_jagcore.h b/drivers/staging/et131x/et1310_jagcore.h index 78228afb7805..0807a01d88ae 100644 --- a/drivers/staging/et131x/et1310_jagcore.h +++ b/drivers/staging/et131x/et1310_jagcore.h @@ -65,8 +65,6 @@ #define INTERNAL_MEM_SIZE 0x400 /* 1024 of internal memory */ #define INTERNAL_MEM_RX_OFFSET 0x1FF /* 50% Tx, 50% Rx */ -#define REGS_MAX_ARRAY 4096 - /* * For interrupts, normal running is: * rxdma_xfr_done, phy_interrupt, mac_stat_interrupt, @@ -85,23 +83,6 @@ #define INT_MASK_ENABLE 0xfffebf17 #define INT_MASK_ENABLE_NO_FLOW 0xfffebfd7 -/* DATA STRUCTURES FOR DIRECT REGISTER ACCESS */ - -typedef struct { - u8 bReadWrite; - u32 nRegCount; - u32 nData[REGS_MAX_ARRAY]; - u32 nOffsets[REGS_MAX_ARRAY]; -} JAGCORE_ACCESS_REGS, *PJAGCORE_ACCESS_REGS; - -typedef struct { - u8 bReadWrite; - u32 nDataWidth; - u32 nRegCount; - u32 nOffsets[REGS_MAX_ARRAY]; - u32 nData[REGS_MAX_ARRAY]; -} PCI_CFG_SPACE_REGS, *PPCI_CFG_SPACE_REGS; - /* Forward declaration of the private adapter structure */ struct et131x_adapter; diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c index a16ce16cfede..19ffb65c90bc 100644 --- a/drivers/staging/et131x/et1310_phy.c +++ b/drivers/staging/et131x/et1310_phy.c @@ -547,7 +547,7 @@ void et131x_Mii_check(struct et131x_adapter *etdev, } etdev->linkspeed = 0; - etdev->duplexMode = 0; + etdev->duplex_mode = 0; /* Free the packets being actively sent & stopped */ et131x_free_busy_send_packets(etdev); diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h index 3ac2343d4288..04bb603bbf84 100644 --- a/drivers/staging/et131x/et131x_adapter.h +++ b/drivers/staging/et131x/et131x_adapter.h @@ -284,10 +284,6 @@ struct et131x_adapter { /* Rx Memory Variables */ RX_RING_t RxRing; - /* ET1310 register Access */ - JAGCORE_ACCESS_REGS JagCoreRegs; - PCI_CFG_SPACE_REGS PciCfgRegs; - /* Loopback specifics */ u8 ReplicaPhyLoopbk; /* Replica Enable */ u8 ReplicaPhyLoopbkPF; /* Replica Enable Pass/Fail */ |