Merge tag 'hwmon-fixes-for-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

torvalds · torvalds · commit f41445645ab5 · 2022-08-10T11:30:16.000-07:00
Pull hwmon fixes from Guenter Roeck:
 "Fix two regressions in nct6775 and lm90 drivers"

* tag 'hwmon-fixes-for-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (nct6775) Fix platform driver suspend regression
  hwmon: (lm90) Fix error return value from detect function
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c
@@ -2321,7 +2321,7 @@ static const char *lm90_detect_nuvoton(struct i2c_client *client, int chip_id,
 	const char *name = NULL;
 
 	if (config2 < 0)
-		return ERR_PTR(-ENODEV);
+		return NULL;
 
 	if (address == 0x4c && !(config1 & 0x2a) && !(config2 & 0xf8)) {
 		if (chip_id == 0x01 && convrate <= 0x09) {
diff --git a/drivers/hwmon/nct6775-core.c b/drivers/hwmon/nct6775-core.c
@@ -1480,7 +1480,7 @@ static int nct6775_update_pwm_limits(struct device *dev)
 	return 0;
 }
 
-static struct nct6775_data *nct6775_update_device(struct device *dev)
+struct nct6775_data *nct6775_update_device(struct device *dev)
 {
 	struct nct6775_data *data = dev_get_drvdata(dev);
 	int i, j, err = 0;
@@ -1615,6 +1615,7 @@ static struct nct6775_data *nct6775_update_device(struct device *dev)
 	mutex_unlock(&data->update_lock);
 	return err ? ERR_PTR(err) : data;
 }
+EXPORT_SYMBOL_GPL(nct6775_update_device);
 
 /*
  * Sysfs callback functions
diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c
@@ -359,7 +359,7 @@ static int __maybe_unused nct6775_suspend(struct device *dev)
 {
 	int err;
 	u16 tmp;
-	struct nct6775_data *data = dev_get_drvdata(dev);
+	struct nct6775_data *data = nct6775_update_device(dev);
 
 	if (IS_ERR(data))
 		return PTR_ERR(data);
diff --git a/drivers/hwmon/nct6775.h b/drivers/hwmon/nct6775.h
@@ -196,6 +196,8 @@ static inline int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 va
 	return regmap_write(data->regmap, reg, value);
 }
 
+struct nct6775_data *nct6775_update_device(struct device *dev);
+
 bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg);
 int nct6775_probe(struct device *dev, struct nct6775_data *data,
 		  const struct regmap_config *regmapcfg);

Original file line number	Diff line number	Diff line change
`@@ -1480,7 +1480,7 @@ static int nct6775_update_pwm_limits(struct device *dev)`
`1480`	`1480`	`return 0;`
`1481`	`1481`	`}`
`1482`	`1482`
`1483`		`-static struct nct6775_data nct6775_update_device(struct device dev)`
	`1483`	`+struct nct6775_data nct6775_update_device(struct device dev)`
`1484`	`1484`	`{`
`1485`	`1485`	`struct nct6775_data *data = dev_get_drvdata(dev);`
`1486`	`1486`	`int i, j, err = 0;`
`@@ -1615,6 +1615,7 @@ static struct nct6775_data nct6775_update_device(struct device dev)`
`1615`	`1615`	`mutex_unlock(&data->update_lock);`
`1616`	`1616`	`return err ? ERR_PTR(err) : data;`
`1617`	`1617`	`}`
	`1618`	`+EXPORT_SYMBOL_GPL(nct6775_update_device);`
`1618`	`1619`
`1619`	`1620`	`/*`
`1620`	`1621`	`* Sysfs callback functions`
Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,7 @@ static int __maybe_unused nct6775_suspend(struct device *dev)`
`359`	`359`	`{`
`360`	`360`	`int err;`
`361`	`361`	`u16 tmp;`
`362`		`- struct nct6775_data *data = dev_get_drvdata(dev);`
	`362`	`+ struct nct6775_data *data = nct6775_update_device(dev);`
`363`	`363`
`364`	`364`	`if (IS_ERR(data))`
`365`	`365`	`return PTR_ERR(data);`
Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,8 @@ static inline int nct6775_write_value(struct nct6775_data *data, u16 reg, u16 va`
`196`	`196`	`return regmap_write(data->regmap, reg, value);`
`197`	`197`	`}`
`198`	`198`
	`199`	`+struct nct6775_data nct6775_update_device(struct device dev);`
	`200`	`+`
`199`	`201`	`bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg);`
`200`	`202`	`int nct6775_probe(struct device dev, struct nct6775_data data,`
`201`	`203`	`const struct regmap_config *regmapcfg);`