Commit 5bd73a16 authored by Rob Herring's avatar Rob Herring Committed by Mark Brown

regulator: 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 to of_property_read_bool().
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230310144722.1544843-1-robh@kernel.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7dda20c9
...@@ -832,8 +832,7 @@ static struct lp872x_platform_data ...@@ -832,8 +832,7 @@ static struct lp872x_platform_data
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
of_property_read_u8(np, "ti,general-config", &pdata->general_config); of_property_read_u8(np, "ti,general-config", &pdata->general_config);
if (of_find_property(np, "ti,update-config", NULL)) pdata->update_config = of_property_read_bool(np, "ti,update-config");
pdata->update_config = true;
pdata->dvs = devm_kzalloc(dev, sizeof(struct lp872x_dvs), GFP_KERNEL); pdata->dvs = devm_kzalloc(dev, sizeof(struct lp872x_dvs), GFP_KERNEL);
if (!pdata->dvs) if (!pdata->dvs)
......
...@@ -943,14 +943,9 @@ static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev, ...@@ -943,14 +943,9 @@ static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev,
} }
of_node_put(regulators_np); of_node_put(regulators_np);
if (of_get_property(pmic_np, "max8997,pmic-buck1-uses-gpio-dvs", NULL)) pdata->buck1_gpiodvs = of_property_read_bool(pmic_np, "max8997,pmic-buck1-uses-gpio-dvs");
pdata->buck1_gpiodvs = true; 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 (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;
if (pdata->buck1_gpiodvs || pdata->buck2_gpiodvs || if (pdata->buck1_gpiodvs || pdata->buck2_gpiodvs ||
pdata->buck5_gpiodvs) { pdata->buck5_gpiodvs) {
......
...@@ -618,8 +618,7 @@ static int max8998_pmic_dt_parse_pdata(struct max8998_dev *iodev, ...@@ -618,8 +618,7 @@ static int max8998_pmic_dt_parse_pdata(struct max8998_dev *iodev,
if (ret) if (ret)
return -EINVAL; return -EINVAL;
if (of_find_property(pmic_np, "max8998,pmic-buck-voltage-lock", NULL)) pdata->buck_voltage_lock = of_property_read_bool(pmic_np, "max8998,pmic-buck-voltage-lock");
pdata->buck_voltage_lock = true;
ret = of_property_read_u32(pmic_np, ret = of_property_read_u32(pmic_np,
"max8998,pmic-buck1-default-dvs-idx", "max8998,pmic-buck1-default-dvs-idx",
......
...@@ -605,7 +605,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, ...@@ -605,7 +605,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
of_node_put(regulators_np); 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; pdata->buck2_gpiodvs = true;
if (of_property_read_u32_array(pmic_np, if (of_property_read_u32_array(pmic_np,
...@@ -616,7 +616,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, ...@@ -616,7 +616,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
} }
} }
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; pdata->buck3_gpiodvs = true;
if (of_property_read_u32_array(pmic_np, if (of_property_read_u32_array(pmic_np,
...@@ -627,7 +627,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, ...@@ -627,7 +627,7 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
} }
} }
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; pdata->buck4_gpiodvs = true;
if (of_property_read_u32_array(pmic_np, if (of_property_read_u32_array(pmic_np,
...@@ -661,14 +661,9 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, ...@@ -661,14 +661,9 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
if (ret) if (ret)
return -EINVAL; return -EINVAL;
if (of_get_property(pmic_np, "s5m8767,pmic-buck2-ramp-enable", NULL)) pdata->buck2_ramp_enable = of_property_read_bool(pmic_np, "s5m8767,pmic-buck2-ramp-enable");
pdata->buck2_ramp_enable = true; 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 (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;
if (pdata->buck2_ramp_enable || pdata->buck3_ramp_enable if (pdata->buck2_ramp_enable || pdata->buck3_ramp_enable
|| pdata->buck4_ramp_enable) { || pdata->buck4_ramp_enable) {
......
...@@ -576,7 +576,7 @@ static int stpmic1_regulator_register(struct platform_device *pdev, int id, ...@@ -576,7 +576,7 @@ static int stpmic1_regulator_register(struct platform_device *pdev, int id,
} }
/* set mask reset */ /* 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) { cfg->mask_reset_reg != 0) {
ret = regmap_update_bits(pmic_dev->regmap, ret = regmap_update_bits(pmic_dev->regmap,
cfg->mask_reset_reg, cfg->mask_reset_reg,
......
...@@ -296,17 +296,10 @@ static struct tps62360_regulator_platform_data * ...@@ -296,17 +296,10 @@ static struct tps62360_regulator_platform_data *
return NULL; return NULL;
} }
if (of_find_property(np, "ti,vsel0-state-high", NULL)) pdata->vsel0_def_state = of_property_read_bool(np, "ti,vsel0-state-high");
pdata->vsel0_def_state = 1; 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");
if (of_find_property(np, "ti,vsel1-state-high", NULL)) pdata->en_discharge = of_property_read_bool(np, "ti,enable-vout-discharge");
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;
return pdata; return pdata;
} }
......
...@@ -729,7 +729,7 @@ static int twlreg_probe(struct platform_device *pdev) ...@@ -729,7 +729,7 @@ static int twlreg_probe(struct platform_device *pdev)
break; 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; info->flags |= TWL_6030_WARM_RESET;
config.dev = &pdev->dev; config.dev = &pdev->dev;
......
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