From: Rabin Vincent <rabin.vincent@stericsson.com>
Date: Wed, 8 Dec 2010 05:37:54 +0000 (+0530)
Subject: nomadik-gpio: use dev name if no name is specified
X-Git-Tag: v2.6.38-rc1~471^2^2~1^2~21
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8d568ae5362c00c5b0b8e61bceb1829c8051002e;p=~shefty%2Frdma-dev.git

nomadik-gpio: use dev name if no name is specified

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>
---

diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
index 5fc8e4d8cd2..eda4e3a11a3 100644
--- 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;