hwmon: shtc1: add support for device tree bindings
Guenter Roeck
maintainerQuoted 28 lines · Chris Ruehl
Add support for DTS bindings for the sensirion shtc1,shtw1 and shtc3.
Signed-off-by Chris Ruehl <[email protected]>--- drivers/hwmon/shtc1.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)drivers/hwmon/shtc1.c +2
-0@@ -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" );
drivers/hwmon/shtc1.c static int shtc1_probe(struct i2c_client *client, · line 243
Quoted 10 lines
drivers/hwmon/shtc1.c +5
-1@@ -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)
Hi
Quoted 50 lines · Guenter Roeck
Quoted 28 lines · Chris Ruehl
Add support for DTS bindings for the sensirion shtc1,shtw1 and shtc3.
Signed-off-by Chris Ruehl <[email protected]>--- drivers/hwmon/shtc1.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)drivers/hwmon/shtc1.c +2
-0@@ -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" );drivers/hwmon/shtc1.c static int shtc1_probe(struct i2c_client *client, · line 243
Quoted 10 lines
drivers/hwmon/shtc1.c +5
-1@@ -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:(quoted diff) +2
-0+ if (np) { + else if (client->dev.platform_data)ERROR: else should follow close brace '}'
#50: FILE:drivers/hwmon/shtc1.c:242:
Review
Quoted 2 lines
(quoted diff) +2
-0+ } + 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