Merge tag 'devicetree-for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / memory / omap-gpmc.c

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index c215287..a2188f7 100644 (file)
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -21,6 +21,7 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/gpio/driver.h>
+#include <linux/gpio/consumer.h> /* GPIO descriptor enum */
 #include <linux/interrupt.h>
 #include <linux/irqdomain.h>
 #include <linux/platform_device.h>
@@ -2145,8 +2146,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
                        gpmc_s.device_width = GPMC_DEVWIDTH_16BIT;
                        break;
                default:
-                       dev_err(&pdev->dev, "%s: invalid 'nand-bus-width'\n",
-                               child->name);
+                       dev_err(&pdev->dev, "%pOFn: invalid 'nand-bus-width'\n",
+                               child);
                        ret = -EINVAL;
                        goto err;
                }
@@ -2170,7 +2171,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
                unsigned int wait_pin = gpmc_s.wait_pin;
 
                waitpin_desc = gpiochip_request_own_desc(&gpmc->gpio_chip,
-                                                        wait_pin, "WAITPIN");
+                                                        wait_pin, "WAITPIN",
+                                                        0);
                if (IS_ERR(waitpin_desc)) {
                        dev_err(&pdev->dev, "invalid wait-pin: %d\n", wait_pin);
                        ret = PTR_ERR(waitpin_desc);
@@ -2186,8 +2188,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
 
        ret = gpmc_cs_set_timings(cs, &gpmc_t, &gpmc_s);
        if (ret) {
-               dev_err(&pdev->dev, "failed to set gpmc timings for: %s\n",
-                       child->name);
+               dev_err(&pdev->dev, "failed to set gpmc timings for: %pOFn\n",
+                       child);
                goto err_cs;
        }
 
@@ -2215,7 +2217,7 @@ no_timings:
 
 err_child_fail:
 
-       dev_err(&pdev->dev, "failed to create gpmc child %s\n", child->name);
+       dev_err(&pdev->dev, "failed to create gpmc child %pOFn\n", child);
        ret = -ENODEV;
 
 err_cs:
@@ -2265,14 +2267,10 @@ static void gpmc_probe_dt_children(struct platform_device *pdev)
        struct device_node *child;
 
        for_each_available_child_of_node(pdev->dev.of_node, child) {
-
-               if (!child->name)
-                       continue;
-
                ret = gpmc_probe_generic_child(pdev, child);
                if (ret) {
-                       dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n",
-                               child->name, ret);
+                       dev_err(&pdev->dev, "failed to probe DT child '%pOFn': %d\n",
+                               child, ret);
                }
        }
 }