mirror of https://gitee.com/openkylin/linux.git
gpio: convert remaining users to gpiochip_add_data()
For completion, sweep the floor from all gpiochip_add() usage so we can remove that function and get rid of the function wrapper gpiochip_add(). Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
31a8944752
commit
4eab22e748
|
@ -499,7 +499,7 @@ static int ichx_gpio_probe(struct platform_device *pdev)
|
|||
|
||||
init:
|
||||
ichx_gpiolib_setup(&ichx_priv.chip);
|
||||
err = gpiochip_add(&ichx_priv.chip);
|
||||
err = gpiochip_add_data(&ichx_priv.chip, NULL);
|
||||
if (err) {
|
||||
pr_err("Failed to register GPIOs\n");
|
||||
goto add_err;
|
||||
|
|
|
@ -114,7 +114,7 @@ static int iop3xx_gpio_probe(struct platform_device *pdev)
|
|||
if (IS_ERR(base))
|
||||
return PTR_ERR(base);
|
||||
|
||||
return gpiochip_add(&iop3xx_chip);
|
||||
return gpiochip_add_data(&iop3xx_chip, NULL);
|
||||
}
|
||||
|
||||
static struct platform_driver iop3xx_gpio_driver = {
|
||||
|
|
|
@ -182,7 +182,7 @@ static int ttl_probe(struct platform_device *pdev)
|
|||
gpio->base = -1;
|
||||
gpio->ngpio = 20;
|
||||
|
||||
ret = gpiochip_add(gpio);
|
||||
ret = gpiochip_add_data(gpio, NULL);
|
||||
if (ret) {
|
||||
dev_err(dev, "unable to add GPIO chip\n");
|
||||
return ret;
|
||||
|
|
|
@ -234,7 +234,7 @@ static struct gpio_chip ks8695_gpio_chip = {
|
|||
/* Register the GPIOs */
|
||||
void ks8695_register_gpios(void)
|
||||
{
|
||||
if (gpiochip_add(&ks8695_gpio_chip))
|
||||
if (gpiochip_add_data(&ks8695_gpio_chip, NULL))
|
||||
printk(KERN_ERR "Unable to register core GPIOs\n");
|
||||
}
|
||||
|
||||
|
|
|
@ -110,6 +110,6 @@ static struct gpio_chip loongson_chip = {
|
|||
|
||||
static int __init loongson_gpio_setup(void)
|
||||
{
|
||||
return gpiochip_add(&loongson_chip);
|
||||
return gpiochip_add_data(&loongson_chip, NULL);
|
||||
}
|
||||
postcore_initcall(loongson_gpio_setup);
|
||||
|
|
|
@ -238,7 +238,7 @@ void __init sa1100_init_gpio(void)
|
|||
GRER = 0;
|
||||
GEDR = -1;
|
||||
|
||||
gpiochip_add(&sa1100_gpio_chip);
|
||||
gpiochip_add_data(&sa1100_gpio_chip, NULL);
|
||||
|
||||
sa1100_gpio_irqdomain = irq_domain_add_simple(NULL,
|
||||
28, IRQ_GPIO0,
|
||||
|
|
|
@ -545,7 +545,7 @@ static int tegra_gpio_probe(struct platform_device *pdev)
|
|||
|
||||
tegra_gpio_chip.of_node = pdev->dev.of_node;
|
||||
|
||||
ret = gpiochip_add(&tegra_gpio_chip);
|
||||
ret = gpiochip_add_data(&tegra_gpio_chip, NULL);
|
||||
if (ret < 0) {
|
||||
irq_domain_remove(irq_domain);
|
||||
return ret;
|
||||
|
|
|
@ -100,7 +100,7 @@ static int gpo_twl6040_probe(struct platform_device *pdev)
|
|||
twl6040gpo_chip.of_node = twl6040_core_dev->of_node;
|
||||
#endif
|
||||
|
||||
ret = gpiochip_add(&twl6040gpo_chip);
|
||||
ret = gpiochip_add_data(&twl6040gpo_chip, NULL);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "could not register gpiochip, %d\n", ret);
|
||||
twl6040gpo_chip.ngpio = 0;
|
||||
|
|
|
@ -544,7 +544,7 @@ static int giu_probe(struct platform_device *pdev)
|
|||
|
||||
vr41xx_gpio_chip.parent = &pdev->dev;
|
||||
|
||||
ret = gpiochip_add(&vr41xx_gpio_chip);
|
||||
ret = gpiochip_add_data(&vr41xx_gpio_chip, NULL);
|
||||
if (!ret) {
|
||||
iounmap(giu_base);
|
||||
return -ENODEV;
|
||||
|
|
|
@ -148,10 +148,10 @@ static int xtensa_gpio_probe(struct platform_device *pdev)
|
|||
{
|
||||
int ret;
|
||||
|
||||
ret = gpiochip_add(&impwire_chip);
|
||||
ret = gpiochip_add_data(&impwire_chip, NULL);
|
||||
if (ret)
|
||||
return ret;
|
||||
return gpiochip_add(&expstate_chip);
|
||||
return gpiochip_add_data(&expstate_chip, NULL);
|
||||
}
|
||||
|
||||
static struct platform_driver xtensa_gpio_driver = {
|
||||
|
|
Loading…
Reference in New Issue