Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03a3a558 authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Linus Walleij
Browse files

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



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

Signed-off-by: default avatarLaxman 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: default avatarMatthias Brugger <matthias.bgg@gmail.com>
Acked-by: default avatarHongzhou Yang <hongzhou.yang@mediatek.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 54d46cd7

drivers/pinctrl/mediatek/pinctrl-mtk-common.c

+6 −11
Original line number Diff line number Diff line
@@ -1395,17 +1395,16 @@ int mtk_pctrl_init(struct platform_device *pdev, 
	pctl->pctl_desc.pmxops = &mtk_pmx_ops;

	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)) {

		dev_err(&pdev->dev, "couldn't register pinctrl driver\n");

		return PTR_ERR(pctl->pctl_dev);

	}



	pctl->chip = devm_kzalloc(&pdev->dev, sizeof(*pctl->chip), GFP_KERNEL);

	if (!pctl->chip) {

		ret = -ENOMEM;

		goto pctrl_error;

	}

	if (!pctl->chip)

		return -ENOMEM;



	*pctl->chip = mtk_gpio_chip;

	pctl->chip->ngpio = pctl->devdata->npins;
@@ -1414,10 +1413,8 @@ int mtk_pctrl_init(struct platform_device *pdev, 
	pctl->chip->base = -1;



	ret = gpiochip_add_data(pctl->chip, pctl);

	if (ret) {

		ret = -EINVAL;

		goto pctrl_error;

	}

	if (ret)

		return -EINVAL;



	/* Register the GPIO to pin mappings. */

	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:

	gpiochip_remove(pctl->chip);

pctrl_error:

	pinctrl_unregister(pctl->pctl_dev);

	return ret;

}