diff options
author | Stefan Assmann <sassmann@kpanic.de> | 2015-04-22 16:50:50 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-22 21:15:24 +0200 |
commit | 21aecc06a81d1d064ca435720ac8002e722a7731 (patch) | |
tree | 92d3a611784ace6401e11d52d672728afd2a1d30 /patches | |
parent | adcc02fdc14b804bf9e530b0ac94a49a448a34a4 (diff) |
backports: remove igb-devm_hwmon_device_register_with_groups.patch
This patch is no longer needed due to commit
commit 69dbc7cf6d34b903c1dc80f1d4f880fc9acfe6fb
Author: Mathieu Olivari <mathieu@qca.qualcomm.com>
Date: Sun Jan 25 09:46:02 2015 -0800
backport: add hwmon group registration functions
which provides the missing functionality now
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches')
2 files changed, 0 insertions, 41 deletions
diff --git a/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/INFO b/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/INFO deleted file mode 100644 index 9169f68e..00000000 --- a/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/INFO +++ /dev/null @@ -1,13 +0,0 @@ -The new hwmon_device_register_with_groups API has not been backported yet. -Address this by putting ifdef around the code using the API. - - -commit 74188cba088192e14cd7fd5433876e8c947bcdd8 -Author: Guenter Roeck <linux@roeck-us.net> -Date: Thu Jul 11 20:00:12 2013 -0700 - - hwmon: Provide managed hwmon registration - -git describe --contains 74188cba088192e14cd7fd5433876e8c947bcdd8 -v3.13-rc1~126^2~30 - diff --git a/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/igb-devm_hwmon_device_register_with_groups.patch b/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/igb-devm_hwmon_device_register_with_groups.patch deleted file mode 100644 index cd839535..00000000 --- a/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/igb-devm_hwmon_device_register_with_groups.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/drivers/net/ethernet/intel/igb/igb_hwmon.c -+++ b/drivers/net/ethernet/intel/igb/igb_hwmon.c -@@ -173,7 +173,9 @@ int igb_sysfs_init(struct igb_adapter *a - { - struct hwmon_buff *igb_hwmon; - struct i2c_client *client; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) - struct device *hwmon_dev; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) */ - unsigned int i; - int rc = 0; - -@@ -230,6 +232,7 @@ int igb_sysfs_init(struct igb_adapter *a - igb_hwmon->groups[0] = &igb_hwmon->group; - igb_hwmon->group.attrs = igb_hwmon->attrs; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) - hwmon_dev = devm_hwmon_device_register_with_groups(&adapter->pdev->dev, - client->name, - igb_hwmon, -@@ -242,6 +245,7 @@ int igb_sysfs_init(struct igb_adapter *a - goto exit; - - err: -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) */ - igb_sysfs_del_adapter(adapter); - exit: - return rc; |