gpiolib: output basic details and consolidate gpio device drivers

This patch adds a kernel message, containing GPIO range and device
name on successful device registration, and removes duplicate messages from the following drivers:
	* gpio-adp5588
	* gpio-bt8xx
	* gpio-cs5535
	* gpio-janz-ttl
	* gpio-nomadik
	* gpio-pcf857x
	* gpio-xilinx
	* drivers/of/gpio.c

Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
[grant.likely@secretlab.ca: squashed 2 patches together]
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c
index 3525ad91877162aefb6cacc5bcd0963f3156aee7..9ad1703d1408aa0c8661de5826e3247ddeaf3f30 100644 (file)
--- a/drivers/gpio/gpio-adp5588.c
+++ b/drivers/gpio/gpio-adp5588.c
@@ -418,9 +418,8 @@ static int __devinit adp5588_gpio_probe(struct i2c_client *client,
        if (ret)
                goto err_irq;
 
-       dev_info(&client->dev, "gpios %d..%d (IRQ Base %d) on a %s Rev. %d\n",
-                       gc->base, gc->base + gc->ngpio - 1,
-                       pdata->irq_base, client->name, revid);
+       dev_info(&client->dev, "IRQ Base: %d Rev.: %d\n",
+                       pdata->irq_base, revid);
 
        if (pdata->setup) {
                ret = pdata->setup(client, gc->base, gc->ngpio, pdata->context);

diff --git a/drivers/gpio/gpio-bt8xx.c b/drivers/gpio/gpio-bt8xx.c
index ec57936aef62ff936bc6cb0244dc029be467a879..5ca4098ba0925c44af3e6d688c609342f821b5af 100644 (file)
--- a/drivers/gpio/gpio-bt8xx.c
+++ b/drivers/gpio/gpio-bt8xx.c
@@ -223,9 +223,6 @@ static int bt8xxgpio_probe(struct pci_dev *dev,
                goto err_release_mem;
        }
 
-       printk(KERN_INFO "bt8xxgpio: Abusing BT8xx card for GPIOs %d to %d\n",
-              bg->gpio.base, bg->gpio.base + BT8XXGPIO_NR_GPIOS - 1);
-
        return 0;
 
 err_release_mem:

diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c
index 6e16cba56ad2e291ca39fdeeadb4844c968b4029..693a81beb3c7587e753c235e213163205d0134e5 100644 (file)
--- a/drivers/gpio/gpio-cs5535.c
+++ b/drivers/gpio/gpio-cs5535.c
@@ -347,7 +347,6 @@ static int __devinit cs5535_gpio_probe(struct platform_device *pdev)
        if (err)
                goto release_region;
 
-       dev_info(&pdev->dev, "GPIO support successfully loaded.\n");
        return 0;
 
 release_region:

diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index 813ac077e5d7d5b0d25e465c53dcb10a023ef595..6f7fda0b61abf1129e514e46443b3d6dd1745c7f 100644 (file)
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -201,8 +201,6 @@ static int __devinit ttl_probe(struct platform_device *pdev)
                goto out_iounmap_regs;
        }
 
-       dev_info(&pdev->dev, "module %d: registered GPIO device\n",
-                            pdata->modno);
        return 0;
 
 out_iounmap_regs:

diff --git a/drivers/gpio/gpio-nomadik.c b/drivers/gpio/gpio-nomadik.c
index 1ebedfb6d46dba7cb7c30e2a9400f6400e8b9159..839624f9fe6aa6dca29aba693dad33671abed888 100644 (file)
--- a/drivers/gpio/gpio-nomadik.c
+++ b/drivers/gpio/gpio-nomadik.c
@@ -1150,8 +1150,8 @@ static int __devinit nmk_gpio_probe(struct platform_device *dev)
 
        nmk_gpio_init_irq(nmk_chip);
 
-       dev_info(&dev->dev, "Bits %i-%i at address %p\n",
-                nmk_chip->chip.base, nmk_chip->chip.base+31, nmk_chip->addr);
+       dev_info(&dev->dev, "at address %p\n",
+                nmk_chip->addr);
        return 0;
 
 out_free:

diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 3e1f1ecd07bec0555b7d16a73049001839591e89..2d1de9e7e9bd921f9db099777ddebce6f19c7056 100644 (file)
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -290,10 +290,7 @@ static int pcf857x_probe(struct i2c_client *client,
         * methods can't be called from sleeping contexts.
         */
 
-       dev_info(&client->dev, "gpios %d..%d on a %s%s\n",
-                       gpio->chip.base,
-                       gpio->chip.base + gpio->chip.ngpio - 1,
-                       client->name,
+       dev_info(&client->dev, "%s\n",
                        client->irq ? " (irq ignored)" : "");
 
        /* Let platform code set up the GPIOs and their users.

diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c
index 0ce6ac9898b113d38fd9a2dd54f70a27d89beb47..79b0fe8a7253523be260f621825eba0ca1bcd29d 100644 (file)
--- a/drivers/gpio/gpio-xilinx.c
+++ b/drivers/gpio/gpio-xilinx.c
@@ -206,7 +206,6 @@ static int __devinit xgpio_of_probe(struct device_node *np)
                       np->full_name, status);
                return status;
        }
-       pr_info("XGpio: %s: registered\n", np->full_name);
        return 0;
 }
 

diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index a971e3d043ba0535ed0539146b5530443cd8af17..698f59ea7c18fb816c18b47756de08ab91da54be 100644 (file)
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1089,6 +1089,10 @@ unlock:
        if (status)
                goto fail;
 
+       pr_info("gpiochip_add: registered GPIOs %d to %d on device: %s\n",
+               chip->base, chip->base + chip->ngpio - 1,
+               chip->label ? : "generic");
+
        return 0;
 fail:
        /* failures here can mean systems won't boot... */

diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c
index ef0105fa52b14d1280e3fb746387d713cb0d7933..ea4f2faab2220faa1373ac3038761947106d352a 100644 (file)
--- a/drivers/of/gpio.c
+++ b/drivers/of/gpio.c
@@ -198,8 +198,6 @@ int of_mm_gpiochip_add(struct device_node *np,
        if (ret)
                goto err2;
 
-       pr_debug("%s: registered as generic GPIO chip, base is %d\n",
-                np->full_name, gc->base);
        return 0;
 err2:
        iounmap(mm_gc->regs);