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>
This commit is contained in:
parent
f4574beb96
commit
64842aad5e
9 changed files with 9 additions and 18 deletions
|
@ -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);
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -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... */
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue