mtd: rawnand: atmel: switch to using devm_fwnode_gpiod_get()

[linux-2.6-microblaze.git] / drivers / mtd / nand / raw / atmel / nand-controller.c

diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c
index 8d6be90..3ba17a9 100644 (file)
--- a/drivers/mtd/nand/raw/atmel/nand-controller.c
+++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -1578,9 +1578,8 @@ static struct atmel_nand *atmel_nand_create(struct atmel_nand_controller *nc,
 
        nand->numcs = numcs;
 
-       gpio = devm_fwnode_get_index_gpiod_from_child(nc->dev, "det", 0,
-                                                     &np->fwnode, GPIOD_IN,
-                                                     "nand-det");
+       gpio = devm_fwnode_gpiod_get(nc->dev, of_fwnode_handle(np),
+                                    "det", GPIOD_IN, "nand-det");
        if (IS_ERR(gpio) && PTR_ERR(gpio) != -ENOENT) {
                dev_err(nc->dev,
                        "Failed to get detect gpio (err = %ld)\n",
@@ -1624,9 +1623,10 @@ static struct atmel_nand *atmel_nand_create(struct atmel_nand_controller *nc,
                        nand->cs[i].rb.type = ATMEL_NAND_NATIVE_RB;
                        nand->cs[i].rb.id = val;
                } else {
-                       gpio = devm_fwnode_get_index_gpiod_from_child(nc->dev,
-                                                       "rb", i, &np->fwnode,
-                                                       GPIOD_IN, "nand-rb");
+                       gpio = devm_fwnode_gpiod_get_index(nc->dev,
+                                                          of_fwnode_handle(np),
+                                                          "rb", i, GPIOD_IN,
+                                                          "nand-rb");
                        if (IS_ERR(gpio) && PTR_ERR(gpio) != -ENOENT) {
                                dev_err(nc->dev,
                                        "Failed to get R/B gpio (err = %ld)\n",
@@ -1640,10 +1640,10 @@ static struct atmel_nand *atmel_nand_create(struct atmel_nand_controller *nc,
                        }
                }
 
-               gpio = devm_fwnode_get_index_gpiod_from_child(nc->dev, "cs",
-                                                             i, &np->fwnode,
-                                                             GPIOD_OUT_HIGH,
-                                                             "nand-cs");
+               gpio = devm_fwnode_gpiod_get_index(nc->dev,
+                                                  of_fwnode_handle(np),
+                                                  "cs", i, GPIOD_OUT_HIGH,
+                                                  "nand-cs");
                if (IS_ERR(gpio) && PTR_ERR(gpio) != -ENOENT) {
                        dev_err(nc->dev,
                                "Failed to get CS gpio (err = %ld)\n",