Commit 67ec8d7b authored by Laxman Dewangan's avatar Laxman Dewangan Committed by Linus Walleij

pinctrl: ish-pfc: Use devm_pinctrl_register() for pinctrl registration

Use devm_pinctrl_register() for pin control registration.
Signed-off-by: default avatarLaxman Dewangan <ldewangan@nvidia.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: linux-renesas-soc@vger.kernel.org
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9ed19e06
...@@ -603,7 +603,6 @@ static int sh_pfc_remove(struct platform_device *pdev) ...@@ -603,7 +603,6 @@ static int sh_pfc_remove(struct platform_device *pdev)
#ifdef CONFIG_PINCTRL_SH_PFC_GPIO #ifdef CONFIG_PINCTRL_SH_PFC_GPIO
sh_pfc_unregister_gpiochip(pfc); sh_pfc_unregister_gpiochip(pfc);
#endif #endif
sh_pfc_unregister_pinctrl(pfc);
return 0; return 0;
} }
......
...@@ -50,14 +50,12 @@ struct sh_pfc { ...@@ -50,14 +50,12 @@ struct sh_pfc {
struct sh_pfc_chip *func; struct sh_pfc_chip *func;
#endif #endif
struct sh_pfc_pinctrl *pinctrl;
}; };
int sh_pfc_register_gpiochip(struct sh_pfc *pfc); int sh_pfc_register_gpiochip(struct sh_pfc *pfc);
int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc); int sh_pfc_unregister_gpiochip(struct sh_pfc *pfc);
int sh_pfc_register_pinctrl(struct sh_pfc *pfc); int sh_pfc_register_pinctrl(struct sh_pfc *pfc);
int sh_pfc_unregister_pinctrl(struct sh_pfc *pfc);
u32 sh_pfc_read_raw_reg(void __iomem *mapped_reg, unsigned int reg_width); u32 sh_pfc_read_raw_reg(void __iomem *mapped_reg, unsigned int reg_width);
void sh_pfc_write_raw_reg(void __iomem *mapped_reg, unsigned int reg_width, void sh_pfc_write_raw_reg(void __iomem *mapped_reg, unsigned int reg_width,
......
...@@ -789,7 +789,6 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc) ...@@ -789,7 +789,6 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc)
return -ENOMEM; return -ENOMEM;
pmx->pfc = pfc; pmx->pfc = pfc;
pfc->pinctrl = pmx;
ret = sh_pfc_map_pins(pfc, pmx); ret = sh_pfc_map_pins(pfc, pmx);
if (ret < 0) if (ret < 0)
...@@ -803,19 +802,9 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc) ...@@ -803,19 +802,9 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc)
pmx->pctl_desc.pins = pmx->pins; pmx->pctl_desc.pins = pmx->pins;
pmx->pctl_desc.npins = pfc->info->nr_pins; pmx->pctl_desc.npins = pfc->info->nr_pins;
pmx->pctl = pinctrl_register(&pmx->pctl_desc, pfc->dev, pmx); pmx->pctl = devm_pinctrl_register(pfc->dev, &pmx->pctl_desc, pmx);
if (IS_ERR(pmx->pctl)) if (IS_ERR(pmx->pctl))
return PTR_ERR(pmx->pctl); return PTR_ERR(pmx->pctl);
return 0; return 0;
} }
int sh_pfc_unregister_pinctrl(struct sh_pfc *pfc)
{
struct sh_pfc_pinctrl *pmx = pfc->pinctrl;
pinctrl_unregister(pmx->pctl);
pfc->pinctrl = NULL;
return 0;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment