projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ec4a637)
nomadik-gpio: use dev name if no name is specified
authorRabin Vincent <rabin.vincent@stericsson.com>
Wed, 8 Dec 2010 05:37:54 +0000 (11:07 +0530)
committerLinus Walleij <linus.walleij@stericsson.com>
Wed, 8 Dec 2010 12:24:50 +0000 (13:24 +0100)
Platforms may choose not to provide an additional name for the GPIO
block.

Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
arch/arm/plat-nomadik/gpio.c patch | blob | blame | history

diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
index 5fc8e4d8cd2a7dc0a4494e57547105b5e7449f64..eda4e3a11a3d1129acbd8885ec67414db2b7638f 100644 (file)
--- a/arch/arm/plat-nomadik/gpio.c
+++ b/arch/arm/plat-nomadik/gpio.c
@@ -672,7 +672,7 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
 
        chip = &nmk_chip->chip;
        chip->base = pdata->first_gpio;
-       chip->label = pdata->name;
+       chip->label = pdata->name ?: dev_name(&dev->dev);
        chip->dev = &dev->dev;
        chip->owner = THIS_MODULE;