Re: [PATCH v2 1/2] hwmon: shtc1: add support for device tree bindings

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi

On 5/7/2020 10:25 pm, Guenter Roeck wrote:
On Sun, Jul 05, 2020 at 11:47:25AM +0800, Chris Ruehl wrote:
Add support for DTS bindings for the sensirion shtc1,shtw1 and shtc3.

Signed-off-by: Chris Ruehl <chris.ruehl@xxxxxxxxxxxx>
---
  drivers/hwmon/shtc1.c | 22 ++++++++++++++++++++--
  1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/drivers/hwmon/shtc1.c b/drivers/hwmon/shtc1.c
index a0078ccede03..61e9275eb666 100644
--- a/drivers/hwmon/shtc1.c
+++ b/drivers/hwmon/shtc1.c
@@ -14,6 +14,7 @@
  #include <linux/err.h>
  #include <linux/delay.h>
  #include <linux/platform_data/shtc1.h>
+#include <linux/of.h>
/* commands (high precision mode) */
  static const unsigned char shtc1_cmd_measure_blocking_hpm[]    = { 0x7C, 0xA2 };
@@ -196,6 +197,7 @@ static int shtc1_probe(struct i2c_client *client,
  	enum shtcx_chips chip = id->driver_data;
  	struct i2c_adapter *adap = client->adapter;
  	struct device *dev = &client->dev;
+	struct device_node *np = dev->of_node;
if (!i2c_check_functionality(adap, I2C_FUNC_I2C)) {
  		dev_err(dev, "plain i2c transactions not supported\n");
@@ -233,8 +235,13 @@ static int shtc1_probe(struct i2c_client *client,
  	data->client = client;
  	data->chip = chip;
- if (client->dev.platform_data)
+	if (np) {
+		data->setup.blocking_io = of_property_read_bool(np, "sensirion,blocking_io");
+		data->setup.high_precision = of_property_read_bool(np, "sensicon,low_precision");
+	}
+	else if (client->dev.platform_data)
  		data->setup = *(struct shtc1_platform_data *)dev->platform_data;

CHECK: braces {} should be used on all arms of this statement
#46: FILE: drivers/hwmon/shtc1.c:238:
+	if (np) {
[...]
+	else if (client->dev.platform_data)
[...]

ERROR: else should follow close brace '}'
#50: FILE: drivers/hwmon/shtc1.c:242:
+	}
+	else if (client->dev.platform_data)


it bites back not using the check-patch script! I _should_ know better! :-(

v3 then.

But i will wait a moment to see if someone else lift a finger.

Chris



[Index of Archives]     [Device Tree Compilter]     [Device Tree Spec]     [Linux Driver Backports]     [Video for Linux]     [Linux USB Devel]     [Linux PCI Devel]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Yosemite Backpacking]


  Powered by Linux