diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 20:28:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-11 20:28:38 -0800 |
| commit | 2634bf2550f4dd7d2d4373725dbe4c4d2a6499fd (patch) | |
| tree | 4c0fd912793f81e3ab330e7546473e1746333ff4 /drivers/hwmon/nct6775.c | |
| parent | e795e5f4e01de550bd8947a7db910daaf7773198 (diff) | |
| parent | 91918d13eb17b8c11a9b6b76bfdd7cc0efab4f50 (diff) | |
| download | linux-2634bf2550f4dd7d2d4373725dbe4c4d2a6499fd.tar.bz2 | |
Merge tag 'hwmon-for-linus-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"Notable hwmon changes:
- Add basic support for NCT6683 on Mitac boards
- Add support for AMD new 15h processors to fam15h_power driver
- Add pmbus client driver for LTC3815
- Remove htu21 driver (now supported by iio subsystem)"
* tag 'hwmon-for-linus-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (nct6683) Add basic support for NCT6683 on Mitac boards
hwmon: (ibmaem) constify aem_rw_sensor_template and aem_ro_sensor_template structures
hwmon: (nct6683,nct6775) constify sensor_template_group structures
MAINTAINERS: change the maintainer of fam15h_power driver
hwmon: (fam15h_power) Add support for AMD new 15h processors
hwmon: (pmbus) Add client driver for LTC3815
hwmon: (htu21) Remove driver
Diffstat (limited to 'drivers/hwmon/nct6775.c')
| -rw-r--r-- | drivers/hwmon/nct6775.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index d7ebdf8651f5..d087a8e00cf5 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -1045,7 +1045,8 @@ struct sensor_template_group { }; static struct attribute_group * -nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg, +nct6775_create_attr_group(struct device *dev, + const struct sensor_template_group *tg, int repeat) { struct attribute_group *group; @@ -1827,7 +1828,7 @@ static struct sensor_device_template *nct6775_attributes_in_template[] = { NULL }; -static struct sensor_template_group nct6775_in_template_group = { +static const struct sensor_template_group nct6775_in_template_group = { .templates = nct6775_attributes_in_template, .is_visible = nct6775_in_is_visible, }; @@ -2046,7 +2047,7 @@ static struct sensor_device_template *nct6775_attributes_fan_template[] = { NULL }; -static struct sensor_template_group nct6775_fan_template_group = { +static const struct sensor_template_group nct6775_fan_template_group = { .templates = nct6775_attributes_fan_template, .is_visible = nct6775_fan_is_visible, .base = 1, @@ -2255,7 +2256,7 @@ static struct sensor_device_template *nct6775_attributes_temp_template[] = { NULL }; -static struct sensor_template_group nct6775_temp_template_group = { +static const struct sensor_template_group nct6775_temp_template_group = { .templates = nct6775_attributes_temp_template, .is_visible = nct6775_temp_is_visible, .base = 1, @@ -3117,7 +3118,7 @@ static struct sensor_device_template *nct6775_attributes_pwm_template[] = { NULL }; -static struct sensor_template_group nct6775_pwm_template_group = { +static const struct sensor_template_group nct6775_pwm_template_group = { .templates = nct6775_attributes_pwm_template, .is_visible = nct6775_pwm_is_visible, .base = 1, |