diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-03-08 10:41:41 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-03-08 10:41:41 +0300 |
| commit | 016bf20829fa00f5e64805f77b7677365151f4af (patch) | |
| tree | 5ef012a06aaa59e7ee5bbed984322f0a97c37309 /drivers/gpio/gpio-xgene-sb.c | |
| parent | a961f9b472de93e770d53b7340a58dbff64b4075 (diff) | |
| parent | 725e3b7d40dffa10dbe0a24ba70676a3127f79fc (diff) | |
| download | linux-016bf20829fa00f5e64805f77b7677365151f4af.tar.xz | |
Merge branch 'devm-gpiochip-add-data' into devel
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; } |