diff options
| author | Laxman Dewangan | 2016-02-28 10:03:21 +0100 |
|---|---|---|
| committer | Linus Walleij | 2016-04-21 09:23:22 +0200 |
| commit | 8f91ed4780d4870c7e442ae37c402864e9370632 (patch) | |
| tree | 0eb3e8cd1c9ccf711d85cd137476bec27434f5c0 /drivers/pinctrl/pinctrl-digicolor.c | |
| parent | pinctrl: at91: Use devm_pinctrl_register() for pinctrl registration (diff) | |
| download | kernel-qcow2-linux-8f91ed4780d4870c7e442ae37c402864e9370632.tar.gz kernel-qcow2-linux-8f91ed4780d4870c7e442ae37c402864e9370632.tar.xz kernel-qcow2-linux-8f91ed4780d4870c7e442ae37c402864e9370632.zip | |
pinctrl: digicolor: Use devm_pinctrl_register() for pinctrl registration
Use devm_pinctrl_register() for pin control registration and clean
error path.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/pinctrl-digicolor.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-digicolor.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/pinctrl/pinctrl-digicolor.c b/drivers/pinctrl/pinctrl-digicolor.c index b347806215e7..30ee56427f56 100644 --- a/drivers/pinctrl/pinctrl-digicolor.c +++ b/drivers/pinctrl/pinctrl-digicolor.c @@ -280,7 +280,7 @@ static int dc_pinctrl_probe(struct platform_device *pdev) struct pinctrl_desc *pctl_desc; char *pin_names; int name_len = strlen("GP_xx") + 1; - int i, j, ret; + int i, j; pmap = devm_kzalloc(&pdev->dev, sizeof(*pmap), GFP_KERNEL); if (!pmap) @@ -326,26 +326,19 @@ static int dc_pinctrl_probe(struct platform_device *pdev) pmap->dev = &pdev->dev; - pmap->pctl = pinctrl_register(pctl_desc, &pdev->dev, pmap); + pmap->pctl = devm_pinctrl_register(&pdev->dev, pctl_desc, pmap); if (IS_ERR(pmap->pctl)) { dev_err(&pdev->dev, "pinctrl driver registration failed\n"); return PTR_ERR(pmap->pctl); } - ret = dc_gpiochip_add(pmap, pdev->dev.of_node); - if (ret < 0) { - pinctrl_unregister(pmap->pctl); - return ret; - } - - return 0; + return dc_gpiochip_add(pmap, pdev->dev.of_node); } static int dc_pinctrl_remove(struct platform_device *pdev) { struct dc_pinmap *pmap = platform_get_drvdata(pdev); - pinctrl_unregister(pmap->pctl); gpiochip_remove(&pmap->chip); return 0; |