redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

pinctrl: mtk-common: Use devm_pinctrl_register() for pinctrl registration

Browse source 
Use devm_pinctrl_register() for pin control registration and clean
the error path.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Hongzhou Yang <hongzhou.yang@mediatek.com>
Cc: Yingjoe Chen <yingjoe.chen@mediatek.com>
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Acked-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Laxman Dewangan 2016-02-28 14:43:15 +05:30 committed by Linus Walleij
parent 54d46cd7d2
commit 03a3a5587e
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/pinctrl/mediatek/pinctrl-mtk-common.c
View file

@ -1395,17 +1395,16 @@ int mtk_pctrl_init(struct platform_device *pdev,
pctl->pctl_desc.pmxops = &mtk_pmx_ops; pctl->pctl_desc.pmxops = &mtk_pmx_ops;
pctl->dev = &pdev->dev; pctl->dev = &pdev->dev;
pctl->pctl_dev = pinctrl_register(&pctl->pctl_desc, &pdev->dev, pctl); pctl->pctl_dev = devm_pinctrl_register(&pdev->dev, &pctl->pctl_desc,
pctl);
if (IS_ERR(pctl->pctl_dev)) { if (IS_ERR(pctl->pctl_dev)) {
dev_err(&pdev->dev, "couldn't register pinctrl driver\n"); dev_err(&pdev->dev, "couldn't register pinctrl driver\n");
return PTR_ERR(pctl->pctl_dev); return PTR_ERR(pctl->pctl_dev);
} }
pctl->chip = devm_kzalloc(&pdev->dev, sizeof(*pctl->chip), GFP_KERNEL); pctl->chip = devm_kzalloc(&pdev->dev, sizeof(*pctl->chip), GFP_KERNEL);
if (!pctl->chip) { if (!pctl->chip)
ret = -ENOMEM; return -ENOMEM;
goto pctrl_error;
}
*pctl->chip = mtk_gpio_chip; *pctl->chip = mtk_gpio_chip;
pctl->chip->ngpio = pctl->devdata->npins; pctl->chip->ngpio = pctl->devdata->npins;
@ -1414,10 +1413,8 @@ int mtk_pctrl_init(struct platform_device *pdev,
pctl->chip->base = -1; pctl->chip->base = -1;
ret = gpiochip_add_data(pctl->chip, pctl); ret = gpiochip_add_data(pctl->chip, pctl);
if (ret) { if (ret)
ret = -EINVAL; return -EINVAL;
goto pctrl_error;
}
/* Register the GPIO to pin mappings. */ /* Register the GPIO to pin mappings. */
ret = gpiochip_add_pin_range(pctl->chip, dev_name(&pdev->dev), ret = gpiochip_add_pin_range(pctl->chip, dev_name(&pdev->dev),
@ -1495,8 +1492,6 @@ int mtk_pctrl_init(struct platform_device *pdev,
chip_error: chip_error:
gpiochip_remove(pctl->chip); gpiochip_remove(pctl->chip);
pctrl_error:
pinctrl_unregister(pctl->pctl_dev);
return ret; return ret;
} }