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

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

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

drivers/pinctrl/sh-pfc/core.c

+0 −1
Original line number Diff line number Diff line
@@ -603,7 +603,6 @@ static int sh_pfc_remove(struct platform_device *pdev) 
#ifdef CONFIG_PINCTRL_SH_PFC_GPIO

	sh_pfc_unregister_gpiochip(pfc);

#endif

	sh_pfc_unregister_pinctrl(pfc);



	return 0;

}

drivers/pinctrl/sh-pfc/core.h

+0 −2
Original line number Diff line number Diff line
@@ -50,14 +50,12 @@ struct sh_pfc { 
	struct sh_pfc_chip *func;

#endif



	struct sh_pfc_pinctrl *pinctrl;

};



int sh_pfc_register_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_unregister_pinctrl(struct sh_pfc *pfc);



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,

drivers/pinctrl/sh-pfc/pinctrl.c

+1 −12
Original line number Diff line number Diff line
@@ -789,7 +789,6 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc) 
		return -ENOMEM;



	pmx->pfc = pfc;

	pfc->pinctrl = pmx;



	ret = sh_pfc_map_pins(pfc, pmx);

	if (ret < 0)
@@ -803,19 +802,9 @@ int sh_pfc_register_pinctrl(struct sh_pfc *pfc) 
	pmx->pctl_desc.pins = pmx->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))

		return PTR_ERR(pmx->pctl);



	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;

}