ixgbe: Convert to use devm_hwmon_device_register_with_groups

[linux-beck.git] / drivers / net / ethernet / intel / ixgbe / ixgbe.h

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
index f38fc0a343a28623a6191657afbc356bbebee3b5..49531cd189878af803f4cf2fdfeba0b3f164ceb9 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -552,8 +552,10 @@ struct hwmon_attr {
 };
 
 struct hwmon_buff {
-       struct device *device;
-       struct hwmon_attr *hwmon_list;
+       struct attribute_group group;
+       const struct attribute_group *groups[2];
+       struct attribute *attrs[IXGBE_MAX_SENSORS * 4 + 1];
+       struct hwmon_attr hwmon_list[IXGBE_MAX_SENSORS * 4];
        unsigned int n_hwmon;
 };
 #endif /* CONFIG_IXGBE_HWMON */
@@ -775,7 +777,7 @@ struct ixgbe_adapter {
        u32 vferr_refcount;
        struct kobject *info_kobj;
 #ifdef CONFIG_IXGBE_HWMON
-       struct hwmon_buff ixgbe_hwmon_buff;
+       struct hwmon_buff *ixgbe_hwmon_buff;
 #endif /* CONFIG_IXGBE_HWMON */
 #ifdef CONFIG_DEBUG_FS
        struct dentry *ixgbe_dbg_adapter;