tg3: Remove unused cfgspc device members

This patch removes the pci_bist and pci_hdr_type members from the
device structure and removes the code that references them.  They are
not really used.

The patch rounds out the changes by moving the pci_cmd member to plug
a structure hole that would have been created.  On 32-bit systems, this
movement removes a subsequent structure hole later in the structure. On
64-bit systems though, the movement merely consolidates two holes into
one larger hole.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index f3cda6428af6..814d82b934db 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2676,10 +2676,9 @@ struct tg3 {
 
         /* PCI block */
         u32                             pci_chip_rev_id;
+        u16                             pci_cmd;
         u8                              pci_cacheline_sz;
         u8                              pci_lat_timer;
-        u8                              pci_hdr_type;
-        u8                              pci_bist;
 
         int                             pm_cap;
         int                             msi_cap;
@@ -2730,7 +2729,6 @@ struct tg3 {
 
         u32                             led_ctrl;
         u32                             phy_otp;
-        u16                             pci_cmd;
 
         char                            board_part_number[24];
 #define TG3_VER_SIZE 32