Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / regulator / tps65132-regulator.c

diff --git a/drivers/regulator/tps65132-regulator.c b/drivers/regulator/tps65132-regulator.c
index e302bd01a0849e261e40b5024ff6836f449557ea..7b0e38f8d62752b8c9d925f1548d66c86469dc8f 100644 (file)
--- a/drivers/regulator/tps65132-regulator.c
+++ b/drivers/regulator/tps65132-regulator.c
@@ -136,9 +136,10 @@ static int tps65132_of_parse_cb(struct device_node *np,
        struct tps65132_reg_pdata *rpdata = &tps->reg_pdata[desc->id];
        int ret;
 
-       rpdata->en_gpiod = devm_fwnode_get_index_gpiod_from_child(tps->dev,
-                                       "enable", 0, &np->fwnode, 0, "enable");
-       if (IS_ERR_OR_NULL(rpdata->en_gpiod)) {
+       rpdata->en_gpiod = devm_fwnode_gpiod_get(tps->dev, of_fwnode_handle(np),
+                                                "enable", GPIOD_ASIS,
+                                                "enable");
+       if (IS_ERR(rpdata->en_gpiod)) {
                ret = PTR_ERR(rpdata->en_gpiod);
 
                /* Ignore the error other than probe defer */
@@ -147,10 +148,12 @@ static int tps65132_of_parse_cb(struct device_node *np,
                return 0;
        }
 
-       rpdata->act_dis_gpiod = devm_fwnode_get_index_gpiod_from_child(
-                                       tps->dev, "active-discharge", 0,
-                                       &np->fwnode, 0, "active-discharge");
-       if (IS_ERR_OR_NULL(rpdata->act_dis_gpiod)) {
+       rpdata->act_dis_gpiod = devm_fwnode_gpiod_get(tps->dev,
+                                                     of_fwnode_handle(np),
+                                                     "active-discharge",
+                                                     GPIOD_ASIS,
+                                                     "active-discharge");
+       if (IS_ERR(rpdata->act_dis_gpiod)) {
                ret = PTR_ERR(rpdata->act_dis_gpiod);
 
                /* Ignore the error other than probe defer */