Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux.git] / drivers / gpio / gpiolib-sysfs.c

diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c
index fbf6b1a0a4fae6ce395fcb9f7a514551ae79258e..23e3d335cd543d53193a6cae63672aa2b8ffbb8d 100644 (file)
--- a/drivers/gpio/gpiolib-sysfs.c
+++ b/drivers/gpio/gpiolib-sysfs.c
@@ -762,10 +762,9 @@ int gpiochip_sysfs_register(struct gpio_device *gdev)
                parent = &gdev->dev;
 
        /* use chip->base for the ID; it's already known to be unique */
-       dev = device_create_with_groups(&gpio_class, parent,
-                                       MKDEV(0, 0),
-                                       chip, gpiochip_groups,
-                                       "gpiochip%d", chip->base);
+       dev = device_create_with_groups(&gpio_class, parent, MKDEV(0, 0), chip,
+                                       gpiochip_groups, GPIOCHIP_NAME "%d",
+                                       chip->base);
        if (IS_ERR(dev))
                return PTR_ERR(dev);