diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-29 22:20:45 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-29 22:20:45 +0300 |
commit | 47d5cc5be396eca67cc89572957ff16f10fd768e (patch) | |
tree | 1f7cc53be5c3d857a3a1724a8dd773997d20620b /drivers/hwmon/hwmon.c | |
parent | 0fc7e74663447682c904fe375bb680b004ddaa14 (diff) | |
parent | 6fbc4232a5ac944531bda397f3644d1cf66bdd13 (diff) | |
download | linux-47d5cc5be396eca67cc89572957ff16f10fd768e.tar.xz |
Merge tag 'hwmon-for-linus-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
- New driver for W83773G
- Fan control support for PMBus drivers
- Improvements and minor fixes in several drivers
* tag 'hwmon-for-linus-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (32 commits)
hwmon: (dell-smm) Disable fan support for Dell Vostro 3360
hwmon: (dell-smm) Disable fan support for Dell Inspiron 7720
hwmon: (dell-smm) Enable broken functionality via "force" module param
hwmon: (k10temp) Add temperature offset for Ryzen 1900X
hwmon: (lm75) Fix trailing semicolon
hwmon: (ina2xx) Fix access to uninitialized mutex
hwmon: (pmbus/ir35221) Remove unnecessary scaling
hwmon: (sht3x) wait predefined limits loading complete before access
hwmon: (pmbus/ibm-cffps) Add dependency on LEDS_CLASS
hwmon: (pmbus/cffps) Add led class device for power supply fault led
hwmon: (pmbus) cffps: Add PMBUS_SKIP_STATUS_CHECK
hwmon: (aspeed-pwm-tacho) Deassert reset in probe
dt-bindings: hwmon: aspeed-pwm-tacho: Add reset node
hwmon: (pmbus) cffps: Add debugfs entries
hwmon: (pmbus) Export pmbus device debugfs directory entry
hwmon: (w83773g) Fix fault detection and reporting
hwmon: (hih6130) Fix documentation of struct hih6130
hwmon: (iio_hwmon) Fix documentation of struct iio_hwmon_state
hwmon: (sht15) Fix parameter documentation of sht15_crc8()
hwmon: (sht21) Fix documentation of struct sht21
...
Diffstat (limited to 'drivers/hwmon/hwmon.c')
-rw-r--r-- | drivers/hwmon/hwmon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index af5123042990..32083e452cde 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c @@ -678,7 +678,7 @@ EXPORT_SYMBOL_GPL(hwmon_device_register_with_groups); * @dev: the parent device * @name: hwmon name attribute * @drvdata: driver data to attach to created device - * @info: pointer to hwmon chip information + * @chip: pointer to hwmon chip information * @extra_groups: pointer to list of additional non-standard attribute groups * * hwmon_device_unregister() must be called when the device is no @@ -785,11 +785,11 @@ EXPORT_SYMBOL_GPL(devm_hwmon_device_register_with_groups); /** * devm_hwmon_device_register_with_info - register w/ hwmon - * @dev: the parent device - * @name: hwmon name attribute - * @drvdata: driver data to attach to created device - * @info: Pointer to hwmon chip information - * @groups - pointer to list of driver specific attribute groups + * @dev: the parent device + * @name: hwmon name attribute + * @drvdata: driver data to attach to created device + * @chip: pointer to hwmon chip information + * @groups: pointer to list of driver specific attribute groups * * Returns the pointer to the new device. The new device is automatically * unregistered with the parent device. |