diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 21:32:12 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 21:32:12 +1100 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /drivers/hwmon/max6697.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'drivers/hwmon/max6697.c')
| -rw-r--r-- | drivers/hwmon/max6697.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/hwmon/max6697.c b/drivers/hwmon/max6697.c index 7fd3eaf817f..f03a7172284 100644 --- a/drivers/hwmon/max6697.c +++ b/drivers/hwmon/max6697.c @@ -495,15 +495,13 @@ static void max6697_get_config_of(struct device_node *node, int len; const __be32 *prop; - prop = of_get_property(node, "smbus-timeout-disable", &len); - if (prop) - pdata->smbus_timeout_disable = true; - prop = of_get_property(node, "extended-range-enable", &len); - if (prop) - pdata->extended_range_enable = true; - prop = of_get_property(node, "beta-compensation-enable", &len); - if (prop) - pdata->beta_compensation = true; + pdata->smbus_timeout_disable = + of_property_read_bool(node, "smbus-timeout-disable"); + pdata->extended_range_enable = + of_property_read_bool(node, "extended-range-enable"); + pdata->beta_compensation = + of_property_read_bool(node, "beta-compensation-enable"); + prop = of_get_property(node, "alert-mask", &len); if (prop && len == sizeof(u32)) pdata->alert_mask = be32_to_cpu(prop[0]); |