Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-microblaze.git] / drivers / gpio / gpiolib-of.c

diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c
index bd31dd3..2f895a2 100644 (file)
--- a/drivers/gpio/gpiolib-of.c
+++ b/drivers/gpio/gpiolib-of.c
@@ -1026,11 +1026,6 @@ int of_gpiochip_add(struct gpio_chip *chip)
        if (ret)
                return ret;
 
-       /* If the chip defines names itself, these take precedence */
-       if (!chip->names)
-               devprop_gpiochip_set_names(chip,
-                                          of_fwnode_handle(chip->of_node));
-
        of_node_get(chip->of_node);
 
        ret = of_gpiochip_scan_gpios(chip);