Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  max1111.c: fix checkpatch warning
  hwmon: (lm75) fix checkpatch warnings
  hwmon: (lm80) fix checkpatch messages
  hwmon: replaced strict_str* with kstr*
  hwmon: (lm75) fix checkpatch warning
  hwmon: (lm75) added error handling
  hwmon: (ltc4261) set data->valid to 0 if error
  hwmon: (f75375s) Add support for F75387SG/RG
  hwmon: (f75375s) Disable setting DC fan control mode for F75373
  hwmon: (f75375s) Initialize pwmX_mode and pwmX_enable if there is no platform data
  hwmon: (f75375s) Fix value range for PWM modes
  hwmon: (f75375s) Use standard sysfs attribute names
  hwmon: (f75375s) Fix checkpatch errors and warnings
  hwmon: (pmbus/zl6100) Only instantiate external temperature sensor if enabled
  hwmon: (pmbus/zl6100) Add support for Ericsson BMR45[0,1] and BMR46[2,3,4]
  hwmon: (pmbus/zl6100) Add support for ZL2005
  hwmon: (pmbus/adm1275) Validate device ID

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/hwmon/jc42.c b/drivers/hwmon/jc42.c
index 1a92951f4031..28c09eead36b 100644
--- a/drivers/hwmon/jc42.c
+++ b/drivers/hwmon/jc42.c
@@ -309,7 +309,7 @@ static ssize_t set_##value(struct device *dev,				\
         struct jc42_data *data = i2c_get_clientdata(client);            \
         int err, ret = count;                                           \
         long val;                                                       \
-        if (strict_strtol(buf, 10, &val) < 0)                           \
+        if (kstrtol(buf, 10, &val) < 0)                         \
                 return -EINVAL;                                         \
         mutex_lock(&data->update_lock);                                 \
         data->value = jc42_temp_to_reg(val, data->extended);            \
@@ -337,7 +337,7 @@ static ssize_t set_temp_crit_hyst(struct device *dev,
         int err;
         int ret = count;
 
-        if (strict_strtoul(buf, 10, &val) < 0)
+        if (kstrtoul(buf, 10, &val) < 0)
                 return -EINVAL;
 
         diff = jc42_temp_from_reg(data->temp_crit) - val;