Merge remote-tracking branch 'usb/usb-next'

[deliverable/linux.git] / drivers / usb / host / fsl-mph-dr-of.c

diff --git a/drivers/usb/host/fsl-mph-dr-of.c b/drivers/usb/host/fsl-mph-dr-of.c
index 1044b0f9d656f122f4bf3a994465147683f9b05f..f07ccb25bc244f4f98c33a80d12a9c874e3696c1 100644 (file)
--- a/drivers/usb/host/fsl-mph-dr-of.c
+++ b/drivers/usb/host/fsl-mph-dr-of.c
@@ -222,23 +222,17 @@ static int fsl_usb2_mph_dr_of_probe(struct platform_device *ofdev)
        pdata->controller_ver = usb_get_ver_info(np);
 
        /* Activate Erratum by reading property in device tree */
-       if (of_get_property(np, "fsl,usb-erratum-a007792", NULL))
-               pdata->has_fsl_erratum_a007792 = 1;
-       else
-               pdata->has_fsl_erratum_a007792 = 0;
-       if (of_get_property(np, "fsl,usb-erratum-a005275", NULL))
-               pdata->has_fsl_erratum_a005275 = 1;
-       else
-               pdata->has_fsl_erratum_a005275 = 0;
+       pdata->has_fsl_erratum_a007792 =
+               of_property_read_bool(np, "fsl,usb-erratum-a007792");
+       pdata->has_fsl_erratum_a005275 =
+               of_property_read_bool(np, "fsl,usb-erratum-a005275");
 
        /*
         * Determine whether phy_clk_valid needs to be checked
         * by reading property in device tree
         */
-       if (of_get_property(np, "phy-clk-valid", NULL))
-               pdata->check_phy_clk_valid = 1;
-       else
-               pdata->check_phy_clk_valid = 0;
+       pdata->check_phy_clk_valid =
+               of_property_read_bool(np, "phy-clk-valid");
 
        if (pdata->have_sysif_regs) {
                if (pdata->controller_ver == FSL_USB_VER_NONE) {