Commit cc6d85c1 authored by Rob Herring's avatar Rob Herring Committed by David S. Miller

nfc: mrvl: Use of_property_read_bool() for boolean properties

It is preferred to use typed property access functions (i.e.
of_property_read_<type> functions) rather than low-level
of_get_property/of_find_property functions for reading properties.
Convert reading boolean properties to of_property_read_bool().
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 053fdaa8
...@@ -168,7 +168,7 @@ static int nfcmrvl_i2c_parse_dt(struct device_node *node, ...@@ -168,7 +168,7 @@ static int nfcmrvl_i2c_parse_dt(struct device_node *node,
return ret; return ret;
} }
if (of_find_property(node, "i2c-int-falling", NULL)) if (of_property_read_bool(node, "i2c-int-falling"))
pdata->irq_polarity = IRQF_TRIGGER_FALLING; pdata->irq_polarity = IRQF_TRIGGER_FALLING;
else else
pdata->irq_polarity = IRQF_TRIGGER_RISING; pdata->irq_polarity = IRQF_TRIGGER_RISING;
......
...@@ -261,11 +261,7 @@ int nfcmrvl_parse_dt(struct device_node *node, ...@@ -261,11 +261,7 @@ int nfcmrvl_parse_dt(struct device_node *node,
return reset_n_io; return reset_n_io;
} }
pdata->reset_n_io = reset_n_io; pdata->reset_n_io = reset_n_io;
pdata->hci_muxed = of_property_read_bool(node, "hci-muxed");
if (of_find_property(node, "hci-muxed", NULL))
pdata->hci_muxed = 1;
else
pdata->hci_muxed = 0;
return 0; return 0;
} }
......
...@@ -56,16 +56,16 @@ struct nfcmrvl_platform_data { ...@@ -56,16 +56,16 @@ struct nfcmrvl_platform_data {
/* GPIO that is wired to RESET_N signal */ /* GPIO that is wired to RESET_N signal */
int reset_n_io; int reset_n_io;
/* Tell if transport is muxed in HCI one */ /* Tell if transport is muxed in HCI one */
unsigned int hci_muxed; bool hci_muxed;
/* /*
* UART specific * UART specific
*/ */
/* Tell if UART needs flow control at init */ /* Tell if UART needs flow control at init */
unsigned int flow_control; bool flow_control;
/* Tell if firmware supports break control for power management */ /* Tell if firmware supports break control for power management */
unsigned int break_control; bool break_control;
/* /*
......
...@@ -76,15 +76,8 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node, ...@@ -76,15 +76,8 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
return ret; return ret;
} }
if (of_find_property(matched_node, "flow-control", NULL)) pdata->flow_control = of_property_read_bool(matched_node, "flow-control");
pdata->flow_control = 1; pdata->break_control = of_property_read_bool(matched_node, "break-control");
else
pdata->flow_control = 0;
if (of_find_property(matched_node, "break-control", NULL))
pdata->break_control = 1;
else
pdata->break_control = 0;
of_node_put(matched_node); of_node_put(matched_node);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment