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: Simon Horman <simon.horman@corigine.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index e74342b0b7289128b7eeac8e12c1f8f2be4368a0..164e2ab859fd9deba8f422e18d6eac74abf9f94d 100644 (file)
--- a/drivers/nfc/nfcmrvl/i2c.c
+++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -168,7 +168,7 @@ static int nfcmrvl_i2c_parse_dt(struct device_node *node,
                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;
        else
                pdata->irq_polarity = IRQF_TRIGGER_RISING;

diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c
index 1a5284de4341b41d29a176c8231cd9d8665552f2..141bc4b66dcb2c79e54099246c1151705ff7dcb7 100644 (file)
--- a/drivers/nfc/nfcmrvl/main.c
+++ b/drivers/nfc/nfcmrvl/main.c
@@ -261,11 +261,7 @@ int nfcmrvl_parse_dt(struct device_node *node,
                return reset_n_io;
        }
        pdata->reset_n_io = reset_n_io;
-
-       if (of_find_property(node, "hci-muxed", NULL))
-               pdata->hci_muxed = 1;
-       else
-               pdata->hci_muxed = 0;
+       pdata->hci_muxed = of_property_read_bool(node, "hci-muxed");
 
        return 0;
 }

diff --git a/drivers/nfc/nfcmrvl/nfcmrvl.h b/drivers/nfc/nfcmrvl/nfcmrvl.h
index 0f22b3233f7339b0001dfc6cee84a8ebd44e83f5..f61a99e553db005febf54c9019dd25d76b9b6d5f 100644 (file)
--- a/drivers/nfc/nfcmrvl/nfcmrvl.h
+++ b/drivers/nfc/nfcmrvl/nfcmrvl.h
@@ -56,16 +56,16 @@ struct nfcmrvl_platform_data {
        /* GPIO that is wired to RESET_N signal */
        int reset_n_io;
        /* Tell if transport is muxed in HCI one */
-       unsigned int hci_muxed;
+       bool hci_muxed;
 
        /*
         * UART specific
         */
 
        /* Tell if UART needs flow control at init */
-       unsigned int flow_control;
+       bool flow_control;
        /* Tell if firmware supports break control for power management */
-       unsigned int break_control;
+       bool break_control;
 
 
        /*

diff --git a/drivers/nfc/nfcmrvl/uart.c b/drivers/nfc/nfcmrvl/uart.c
index 9c92cbdc42f081f59c6f6dd05c181fca41f1295b..956ae92f75734eeb16ad8358d22f56ecf0efbcb7 100644 (file)
--- a/drivers/nfc/nfcmrvl/uart.c
+++ b/drivers/nfc/nfcmrvl/uart.c
@@ -76,15 +76,8 @@ static int nfcmrvl_uart_parse_dt(struct device_node *node,
                return ret;
        }
 
-       if (of_find_property(matched_node, "flow-control", NULL))
-               pdata->flow_control = 1;
-       else
-               pdata->flow_control = 0;
-
-       if (of_find_property(matched_node, "break-control", NULL))
-               pdata->break_control = 1;
-       else
-               pdata->break_control = 0;
+       pdata->flow_control = of_property_read_bool(matched_node, "flow-control");
+       pdata->break_control = of_property_read_bool(matched_node, "break-control");
 
        of_node_put(matched_node);