return ERR_PTR(-ENOMEM);
 
        of_property_read_u8(np, "ti,general-config", &pdata->general_config);
-       if (of_find_property(np, "ti,update-config", NULL))
-               pdata->update_config = true;
+       pdata->update_config = of_property_read_bool(np, "ti,update-config");
 
        pdata->dvs = devm_kzalloc(dev, sizeof(struct lp872x_dvs), GFP_KERNEL);
        if (!pdata->dvs)
 
        }
        of_node_put(regulators_np);
 
-       if (of_get_property(pmic_np, "max8997,pmic-buck1-uses-gpio-dvs", NULL))
-               pdata->buck1_gpiodvs = true;
-
-       if (of_get_property(pmic_np, "max8997,pmic-buck2-uses-gpio-dvs", NULL))
-               pdata->buck2_gpiodvs = true;
-
-       if (of_get_property(pmic_np, "max8997,pmic-buck5-uses-gpio-dvs", NULL))
-               pdata->buck5_gpiodvs = true;
+       pdata->buck1_gpiodvs = of_property_read_bool(pmic_np, "max8997,pmic-buck1-uses-gpio-dvs");
+       pdata->buck2_gpiodvs = of_property_read_bool(pmic_np, "max8997,pmic-buck2-uses-gpio-dvs");
+       pdata->buck5_gpiodvs = of_property_read_bool(pmic_np, "max8997,pmic-buck5-uses-gpio-dvs");
 
        if (pdata->buck1_gpiodvs || pdata->buck2_gpiodvs ||
                                                pdata->buck5_gpiodvs) {
 
        if (ret)
                return -EINVAL;
 
-       if (of_find_property(pmic_np, "max8998,pmic-buck-voltage-lock", NULL))
-               pdata->buck_voltage_lock = true;
+       pdata->buck_voltage_lock = of_property_read_bool(pmic_np, "max8998,pmic-buck-voltage-lock");
 
        ret = of_property_read_u32(pmic_np,
                                        "max8998,pmic-buck1-default-dvs-idx",
 
 
        of_node_put(regulators_np);
 
-       if (of_get_property(pmic_np, "s5m8767,pmic-buck2-uses-gpio-dvs", NULL)) {
+       if (of_property_read_bool(pmic_np, "s5m8767,pmic-buck2-uses-gpio-dvs")) {
                pdata->buck2_gpiodvs = true;
 
                if (of_property_read_u32_array(pmic_np,
                }
        }
 
-       if (of_get_property(pmic_np, "s5m8767,pmic-buck3-uses-gpio-dvs", NULL)) {
+       if (of_property_read_bool(pmic_np, "s5m8767,pmic-buck3-uses-gpio-dvs")) {
                pdata->buck3_gpiodvs = true;
 
                if (of_property_read_u32_array(pmic_np,
                }
        }
 
-       if (of_get_property(pmic_np, "s5m8767,pmic-buck4-uses-gpio-dvs", NULL)) {
+       if (of_property_read_bool(pmic_np, "s5m8767,pmic-buck4-uses-gpio-dvs")) {
                pdata->buck4_gpiodvs = true;
 
                if (of_property_read_u32_array(pmic_np,
        if (ret)
                return -EINVAL;
 
-       if (of_get_property(pmic_np, "s5m8767,pmic-buck2-ramp-enable", NULL))
-               pdata->buck2_ramp_enable = true;
-
-       if (of_get_property(pmic_np, "s5m8767,pmic-buck3-ramp-enable", NULL))
-               pdata->buck3_ramp_enable = true;
-
-       if (of_get_property(pmic_np, "s5m8767,pmic-buck4-ramp-enable", NULL))
-               pdata->buck4_ramp_enable = true;
+       pdata->buck2_ramp_enable = of_property_read_bool(pmic_np, "s5m8767,pmic-buck2-ramp-enable");
+       pdata->buck3_ramp_enable = of_property_read_bool(pmic_np, "s5m8767,pmic-buck3-ramp-enable");
+       pdata->buck4_ramp_enable = of_property_read_bool(pmic_np, "s5m8767,pmic-buck4-ramp-enable");
 
        if (pdata->buck2_ramp_enable || pdata->buck3_ramp_enable
                        || pdata->buck4_ramp_enable) {
 
        }
 
        /* set mask reset */
-       if (of_get_property(config.of_node, "st,mask-reset", NULL) &&
+       if (of_property_read_bool(config.of_node, "st,mask-reset") &&
            cfg->mask_reset_reg != 0) {
                ret = regmap_update_bits(pmic_dev->regmap,
                                         cfg->mask_reset_reg,
 
                return NULL;
        }
 
-       if (of_find_property(np, "ti,vsel0-state-high", NULL))
-               pdata->vsel0_def_state = 1;
-
-       if (of_find_property(np, "ti,vsel1-state-high", NULL))
-               pdata->vsel1_def_state = 1;
-
-       if (of_find_property(np, "ti,enable-pull-down", NULL))
-               pdata->en_internal_pulldn = true;
-
-       if (of_find_property(np, "ti,enable-vout-discharge", NULL))
-               pdata->en_discharge = true;
+       pdata->vsel0_def_state = of_property_read_bool(np, "ti,vsel0-state-high");
+       pdata->vsel1_def_state = of_property_read_bool(np, "ti,vsel1-state-high");
+       pdata->en_internal_pulldn = of_property_read_bool(np, "ti,enable-pull-down");
+       pdata->en_discharge = of_property_read_bool(np, "ti,enable-vout-discharge");
 
        return pdata;
 }
 
                break;
        }
 
-       if (of_get_property(np, "ti,retain-on-reset", NULL))
+       if (of_property_read_bool(np, "ti,retain-on-reset"))
                info->flags |= TWL_6030_WARM_RESET;
 
        config.dev = &pdev->dev;