Merge tag 'efi-2020-04-rc1-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / drivers / gpio / 74x164_gpio.c

diff --git a/drivers/gpio/74x164_gpio.c b/drivers/gpio/74x164_gpio.c
index 9ac10a745d20434981ece71d8090168ba2fade08..dcb1c1b3699770f5404fc64c7c2f9c8f6b14d2fb 100644 (file)
--- a/drivers/gpio/74x164_gpio.c
+++ b/drivers/gpio/74x164_gpio.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Take drivers/gpio/gpio-74x164.c as reference.
  *
@@ -5,8 +6,6 @@
  *
  * Copyright (C) 2016 Peng Fan <van.freenix@gmail.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  */
 
 #include <common.h>
@@ -106,7 +105,7 @@ static int gen_74x164_get_function(struct udevice *dev, unsigned offset)
 }
 
 static int gen_74x164_xlate(struct udevice *dev, struct gpio_desc *desc,
-                           struct fdtdec_phandle_args *args)
+                           struct ofnode_phandle_args *args)
 {
        desc->offset = args->args[0];
        desc->flags = args->args[1] & GPIO_ACTIVE_LOW ? GPIOD_ACTIVE_LOW : 0;
@@ -130,7 +129,7 @@ static int gen_74x164_probe(struct udevice *dev)
        char *str, name[32];
        int ret;
        const void *fdt = gd->fdt_blob;
-       int node = dev->of_offset;
+       int node = dev_of_offset(dev);
 
        snprintf(name, sizeof(name), "%s_", dev->name);
        str = strdup(name);
@@ -156,8 +155,7 @@ static int gen_74x164_probe(struct udevice *dev)
        ret = gpio_request_by_name(dev, "oe-gpios", 0, &priv->oe,
                                   GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
        if (ret) {
-               dev_err(dev, "No oe-pins property\n");
-               goto free_buf;
+               dev_dbg(dev, "No oe-pins property\n");
        }
 
        uc_priv->bank_name = str;