diff options
| author | Stefan Assmann <sassmann@kpanic.de> | 2014-05-16 13:21:23 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-06-02 00:16:15 +0200 |
| commit | 2b21554d3828d5dbfa8bc80f03d8e98aeab953b5 (patch) | |
| tree | 6ec99cca5ff28a18157ea8dd9907fc47fc870d63 | |
| parent | bf1bba766cf487273feb65ef06494ed48a397a9f (diff) | |
backports: handle hwmon_device_register_with_groups API calls
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
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2 files changed, 43 insertions, 0 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 new file mode 100644 index 00000000..9169f68e --- /dev/null +++ b/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/INFO @@ -0,0 +1,13 @@ +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 new file mode 100644 index 00000000..9f4f40ef --- /dev/null +++ b/patches/collateral-evolutions/network/0041-devm_hwmon_device_register_with_groups/igb-devm_hwmon_device_register_with_groups.patch @@ -0,0 +1,30 @@ +diff --git a/drivers/net/ethernet/intel/igb/igb_hwmon.c b/drivers/net/ethernet/intel/igb/igb_hwmon.c +index 2eee9bb..ad08b1f 100644 +--- 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 *adapter) + { + 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 *adapter) + 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 *adapter) + goto exit; + + err: ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0) */ + igb_sysfs_del_adapter(adapter); + exit: + return rc; |