{
        int ret;
 
-       if (of_get_property(np, "marvell,88pm860x-irq-read-clr", NULL))
-               pdata->irq_mode = 1;
+       pdata->irq_mode = of_property_read_bool(np, "marvell,88pm860x-irq-read-clr");
        ret = of_property_read_u32(np, "marvell,88pm860x-slave-addr",
                                   &pdata->companion_addr);
        if (ret) {
 
        of_property_read_u32_array(np, "wlf,micbias-cfg", pdata->micbias,
                                   ARRAY_SIZE(pdata->micbias));
 
-       pdata->lineout1_diff = true;
-       pdata->lineout2_diff = true;
-       if (of_find_property(np, "wlf,lineout1-se", NULL))
-               pdata->lineout1_diff = false;
-       if (of_find_property(np, "wlf,lineout2-se", NULL))
-               pdata->lineout2_diff = false;
-
-       if (of_find_property(np, "wlf,lineout1-feedback", NULL))
-               pdata->lineout1fb = true;
-       if (of_find_property(np, "wlf,lineout2-feedback", NULL))
-               pdata->lineout2fb = true;
-
-       if (of_find_property(np, "wlf,ldoena-always-driven", NULL))
-               pdata->lineout2fb = true;
+       pdata->lineout1_diff = !of_property_read_bool(np, "wlf,lineout1-se");
+       pdata->lineout2_diff = !of_property_read_bool(np, "wlf,lineout2-se");
+       pdata->lineout1fb = of_property_read_bool(np, "wlf,lineout1-feedback");
+       pdata->lineout2fb = of_property_read_bool(np, "wlf,lineout2-feedback") ||
+               of_property_read_bool(np, "wlf,ldoena-always-driven");
 
        pdata->spkmode_pu = of_property_read_bool(np, "wlf,spkmode-pu");