diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-02-25 14:22:10 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-02-25 14:22:10 +0100 |
| commit | 725e3b7d40dffa10dbe0a24ba70676a3127f79fc (patch) | |
| tree | 3b4cfc0973de0f6459a5a340c997a78ae1dfcdb1 /drivers/gpio/gpio-xgene-sb.c | |
| parent | ea1361fd5f26f1dbb369f85b3ad42a84c133e7e1 (diff) | |
| parent | 9d113c696f4081bf95dd7553d6369998a666b0fa (diff) | |
| download | talos-obmc-linux-725e3b7d40dffa10dbe0a24ba70676a3127f79fc.tar.gz talos-obmc-linux-725e3b7d40dffa10dbe0a24ba70676a3127f79fc.zip | |
Merge branch 'devm_gpiochip' of https://github.com/ldewangan/linux-upstream into devm-gpiochip-add-data
Diffstat (limited to 'drivers/gpio/gpio-xgene-sb.c')
| -rw-r--r-- | drivers/gpio/gpio-xgene-sb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-xgene-sb.c b/drivers/gpio/gpio-xgene-sb.c index fd81ebc8d365..31cbcb84cfaf 100644 --- a/drivers/gpio/gpio-xgene-sb.c +++ b/drivers/gpio/gpio-xgene-sb.c @@ -311,7 +311,7 @@ static int xgene_gpio_sb_probe(struct platform_device *pdev) priv->gc.irqdomain = priv->irq_domain; - ret = gpiochip_add_data(&priv->gc, priv); + ret = devm_gpiochip_add_data(&pdev->dev, &priv->gc, priv); if (ret) { dev_err(&pdev->dev, "failed to register X-Gene GPIO Standby driver\n"); @@ -339,7 +339,6 @@ static int xgene_gpio_sb_remove(struct platform_device *pdev) irq_domain_remove(priv->irq_domain); - gpiochip_remove(&priv->gc); return 0; } |
