igb: make dev_spec a union and remove dynamic allocation

This patch makes dev_spec a union and simplifies it so that it does not
require dynamic allocation and freeing in the driver.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index 99504a600a80..06f72ae6a2c2 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -565,9 +565,12 @@ struct e1000_fc_info {
         enum e1000_fc_type original_type;
 };
 
+struct e1000_dev_spec_82575 {
+        bool sgmii_active;
+};
+
 struct e1000_hw {
         void *back;
-        void *dev_spec;
 
         u8 __iomem *hw_addr;
         u8 __iomem *flash_address;
@@ -580,7 +583,9 @@ struct e1000_hw {
         struct e1000_bus_info  bus;
         struct e1000_host_mng_dhcp_cookie mng_cookie;
 
-        u32 dev_spec_size;
+        union {
+                struct e1000_dev_spec_82575     _82575;
+        } dev_spec;
 
         u16 device_id;
         u16 subsystem_vendor_id;