diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 09:00:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 09:00:03 -0800 |
| commit | a26a9d8ab4f9edbdfb087a563b6613e9970ef0b0 (patch) | |
| tree | a28248f140839b9801cc9902a06e3b4b5aa0914c /drivers/hwmon/smsc47m1.c | |
| parent | 983e4adae0cfa4d3dfdf73b79aabc450dda8ce0e (diff) | |
| parent | 6ab3332cc692ad04dfa30c92d3391aea8b971ef2 (diff) | |
Merge tag 'hwmon-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"New drivers:
- Texas Instruments TPS23861 driver
- AHT10 Temperature and Humidity Sensor Driver
Support for new chips/variants to existing drivers:
- Add AMD family 19h model 30h x86 match to amd_energy driver
- Add Zen3 Ryzen Desktop CPUs support to k10temp driver
- Add support for MAX16508 to max16601 driver
- Support revision "B" of max31785
- Add support for ASRock boards to nct6683 driver
Driver removals:
- Decomission abx500 driver
Various other minor fixes and improvements"
* tag 'hwmon-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (30 commits)
MAINTAINERS: Add entry for Texas Instruments TPS23861 PoE PSE
hwmon: add Texas Instruments TPS23861 driver
dt-bindings: hwmon: Add TI TPS23861 bindings
hwmon: (da9052) Switch to using the new API kobj_to_dev()
hwmon: (amd_energy) Add AMD family 19h model 30h x86 match
hwmon: (pmbus/max31785) Support revision "B"
hwmon: (pmbus/lm25066) Remove unnecessary pmbus_clear_cache function call
hwmon: (pmbus) Clear sensor data after chip write
hwmon: (pmbus/max16601) Add support for MAX16508
hwmon: (pmbus/max16601) Determine and use number of populated phases
hwmon: (pmbus) Simplify the calculation of variables
hwmon: (aht10) Unlock on error in aht10_read_values()
hwmon: (pwm-fan) stop using legacy PWM functions and some cleanups
hwmon: Add AHT10 Temperature and Humidity Sensor Driver
hwmon: (applesmc) Assign boolean values to a bool variable
hwmon: (nct6683) Support ASRock boards
hwmon: (aspeed-pwm-tacho) Switch to using the new API kobj_to_dev()
hwmon: (max6650) Switch to using the new API kobj_to_dev()
hwmon: (pwm-fan) Support multiple fan tachometers
hwmon: (pwm-fan) Store tach data separately
...
Diffstat (limited to 'drivers/hwmon/smsc47m1.c')
| -rw-r--r-- | drivers/hwmon/smsc47m1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c index b637836b58a1..37531b5c8254 100644 --- a/drivers/hwmon/smsc47m1.c +++ b/drivers/hwmon/smsc47m1.c @@ -682,7 +682,7 @@ static int __init smsc47m1_handle_resources(unsigned short address, /* Request the resources */ if (!devm_request_region(dev, start, len, DRVNAME)) { dev_err(dev, - "Region 0x%hx-0x%hx already in use!\n", + "Region 0x%x-0x%x already in use!\n", start, start + len); return -EBUSY; } |