mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-23 08:35:19 -05:00
Code Activity

hwmon fixes for v5.17-rc2

Browse source 
- Fix crash in nct6775 driver
 - Prevent divide by zero in adt7470 driver
 - Fix conditional compile warning in pmbus/ir38064 driver
 - Various minor fixes in lm90 driver
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEiHPvMQj9QTOCiqgVyx8mb86fmYEFAmHzhNAACgkQyx8mb86f
 mYGGMxAAiVuRy6/Zc9+j4bAgBfVdMwVf3Hct2P6LZwOmAB/mCF9iM3OJF0SI+skr
 2D8NxuW44VMW7alkJQIXNY65ZWzzYS+N3OHRvpyX3EB0X+XB4p2T52ly4klATCei
 g/2EPwvWGuMO/GQKLgqG0Scq2FC7btW6KmouvKOvGwL3Xwn7EQXaGFq9HmHjw+LU
 p7Jyr3R7ECbvaX2WGzOhYtrNVxJ/nShaSp5L0WeIX+4CyHSg3tCuUbrjYJHGE8rj
 nRlp2PkzMYFsepS3vMsMVHIoRgMxgRN3V2Yif4fYur6r+7pABr986RQ4YFy3SREV
 h3I9yKAASRo24vwqr6B49bOMH+ed5p4iywhRKBR1a3bhMlko7Yqr4jU+a3zLeYqL
 IQreFmmOa7CETuqQoZDBjC1y5fBXCraNaY8iVFlAXoMVRZPcjTjgU0qa+sk2MjWU
 sbnVN1L0xu0i2S9mvdSpj8IWs6WPS0cinrP95uw12XhVEc6NUHsnqkc3AXZuqCFo
 YjFahGQvKDV+rRYNzB/WL63r2VEuTI+rsB40qJ+I+VcL7iQbxvLzCdiax+r2zg5U
 kVHqBadoUVdFhkB3iBRyxi0oSVmeLygCNTwJW5GePMeeHhS3ggPYtXavudR14FSp
 UijDCXKR4rlvt3v59oGQ0rtKe9Q+yF2gDYEAgh96fF1yaANQgf8=
 =prEo
 -----END PGP SIGNATURE-----

Merge tag 'hwmon-for-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - Fix crash in nct6775 driver

 - Prevent divide by zero in adt7470 driver

 - Fix conditional compile warning in pmbus/ir38064 driver

 - Various minor fixes in lm90 driver

* tag 'hwmon-for-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (nct6775) Fix crash in clear_caseopen
  hwmon: (adt7470) Prevent divide by zero in adt7470_fan_write()
  hwmon: (pmbus/ir38064) Mark ir38064_of_match as __maybe_unused
  hwmon: (lm90) Fix sysfs and udev notifications
  hwmon: (lm90) Mark alert as broken for MAX6646/6647/6649
  hwmon: (lm90) Mark alert as broken for MAX6680
  hwmon: (lm90) Mark alert as broken for MAX6654
  hwmon: (lm90) Re-enable interrupts after alert clears
  hwmon: (lm90) Reduce maximum conversion rate for G781
This commit is contained in:
Linus Torvalds 2022-01-28 09:48:20 +02:00
commit 374630e3f9
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/hwmon/adt7470.c
View file

@ -662,6 +662,9 @@ static int adt7470_fan_write(struct device *dev, u32 attr, int channel, long val
struct adt7470_data *data = dev_get_drvdata(dev);
int err;
if (val <= 0)
return -EINVAL;
val = FAN_RPM_TO_PERIOD(val);
val = clamp_val(val, 1, 65534);

21
drivers/hwmon/lm90.c
View file

@ -373,7 +373,7 @@ static const struct lm90_params lm90_params[] = {
.flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
| LM90_HAVE_BROKEN_ALERT | LM90_HAVE_CRIT,
.alert_alarms = 0x7c,
.max_convrate = 8,
.max_convrate = 7,
},
[lm86] = {
.flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT
@ -394,12 +394,13 @@ static const struct lm90_params lm90_params[] = {
.max_convrate = 9,
},
[max6646] = {
.flags = LM90_HAVE_CRIT,
.flags = LM90_HAVE_CRIT | LM90_HAVE_BROKEN_ALERT,
.alert_alarms = 0x7c,
.max_convrate = 6,
.reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL,
},
[max6654] = {
.flags = LM90_HAVE_BROKEN_ALERT,
.alert_alarms = 0x7c,
.max_convrate = 7,
.reg_local_ext = MAX6657_REG_R_LOCAL_TEMPL,
@ -418,7 +419,7 @@ static const struct lm90_params lm90_params[] = {
},
[max6680] = {
.flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT
| LM90_HAVE_CRIT_ALRM_SWP,
| LM90_HAVE_CRIT_ALRM_SWP | LM90_HAVE_BROKEN_ALERT,
.alert_alarms = 0x7c,
.max_convrate = 7,
},
@ -848,7 +849,7 @@ static int lm90_update_device(struct device *dev)
* Re-enable ALERT# output if it was originally enabled and
* relevant alarms are all clear
*/
if (!(data->config_orig & 0x80) &&
if ((client->irq || !(data->config_orig & 0x80)) &&
!(data->alarms & data->alert_alarms)) {
if (data->config & 0x80) {
dev_dbg(&client->dev, "Re-enabling ALERT#\n");
@ -1807,22 +1808,22 @@ static bool lm90_is_tripped(struct i2c_client *client, u16 *status)
if (st & LM90_STATUS_LLOW)
hwmon_notify_event(data->hwmon_dev, hwmon_temp,
hwmon_temp_min, 0);
hwmon_temp_min_alarm, 0);
if (st & LM90_STATUS_RLOW)
hwmon_notify_event(data->hwmon_dev, hwmon_temp,
hwmon_temp_min, 1);
hwmon_temp_min_alarm, 1);
if (st2 & MAX6696_STATUS2_R2LOW)
hwmon_notify_event(data->hwmon_dev, hwmon_temp,
hwmon_temp_min, 2);
hwmon_temp_min_alarm, 2);
if (st & LM90_STATUS_LHIGH)
hwmon_notify_event(data->hwmon_dev, hwmon_temp,
hwmon_temp_max, 0);
hwmon_temp_max_alarm, 0);
if (st & LM90_STATUS_RHIGH)
hwmon_notify_event(data->hwmon_dev, hwmon_temp,
hwmon_temp_max, 1);
hwmon_temp_max_alarm, 1);
if (st2 & MAX6696_STATUS2_R2HIGH)
hwmon_notify_event(data->hwmon_dev, hwmon_temp,
hwmon_temp_max, 2);
hwmon_temp_max_alarm, 2);
return true;
}

6
drivers/hwmon/nct6775.c
View file

@ -1175,7 +1175,7 @@ static inline u8 in_to_reg(u32 val, u8 nr)
struct nct6775_data {
int addr; /* IO base of hw monitor block */
int sioreg; /* SIO register address */
struct nct6775_sio_data *sio_data;
enum kinds kind;
const char *name;
@ -3559,7 +3559,7 @@ clear_caseopen(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
struct nct6775_data *data = dev_get_drvdata(dev);
struct nct6775_sio_data *sio_data = dev_get_platdata(dev);
struct nct6775_sio_data *sio_data = data->sio_data;
int nr = to_sensor_dev_attr(attr)->index - INTRUSION_ALARM_BASE;
unsigned long val;
u8 reg;
@ -3967,7 +3967,7 @@ static int nct6775_probe(struct platform_device *pdev)
return -ENOMEM;
data->kind = sio_data->kind;
data->sioreg = sio_data->sioreg;
data->sio_data = sio_data;
if (sio_data->access == access_direct) {
data->addr = res->start;

2
drivers/hwmon/pmbus/ir38064.c
View file

@ -62,7 +62,7 @@ static const struct i2c_device_id ir38064_id[] = {
MODULE_DEVICE_TABLE(i2c, ir38064_id);
static const struct of_device_id ir38064_of_match[] = {
static const struct of_device_id __maybe_unused ir38064_of_match[] = {
{ .compatible = "infineon,ir38060" },
{ .compatible = "infineon,ir38064" },
{ .compatible = "infineon,ir38164" },