Staging: et131x: continue pruning unused fields

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_jagcore.h b/drivers/staging/et131x/et1310_jagcore.h
index 78228afb780536572fc4edfc1cb2167cad40990e..0807a01d88aef507c20a6e73bb3465f33339facd 100644 (file)
--- 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 a16ce16cfeded928009300b21fe063d504a1517c..19ffb65c90bc4dc74526249f55914656f872ce16 100644 (file)
--- 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 3ac2343d42884f6c54bbafcc48505bf72e7a1c02..04bb603bbf84b540eead7be80fd25ee6d364b5be 100644 (file)
--- 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 */