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

Commit aef1d000 authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Linus Walleij
Browse files

sh-pfc: sh73a0: Introduce the use of devm_regulator_register 



This patch moves data allocated using regulator_register to
devm_regulator_register and does away the calls to regulator_unregister.
The sh73a0_pinmux_soc_exit function is no longer needed and is removed.

Signed-off-by: default avatarHimangi Saraogi <himangi774@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 4281a16d

drivers/pinctrl/sh-pfc/pfc-sh73a0.c

+2 −9
Original line number Diff line number Diff line
@@ -3842,7 +3842,8 @@ static int sh73a0_pinmux_soc_init(struct sh_pfc *pfc) 
	cfg.init_data = &sh73a0_vccq_mc0_init_data;

	cfg.driver_data = pfc;



	data->vccq_mc0 = regulator_register(&sh73a0_vccq_mc0_desc, &cfg);

	data->vccq_mc0 = devm_regulator_register(pfc->dev,

						 &sh73a0_vccq_mc0_desc, &cfg);

	if (IS_ERR(data->vccq_mc0)) {

		ret = PTR_ERR(data->vccq_mc0);

		dev_err(pfc->dev, "Failed to register VCCQ MC0 regulator: %d\n",
@@ -3855,16 +3856,8 @@ static int sh73a0_pinmux_soc_init(struct sh_pfc *pfc) 
	return 0;

}



static void sh73a0_pinmux_soc_exit(struct sh_pfc *pfc)

{

	struct sh73a0_pinmux_data *data = pfc->soc_data;



	regulator_unregister(data->vccq_mc0);

}



static const struct sh_pfc_soc_operations sh73a0_pinmux_ops = {

	.init = sh73a0_pinmux_soc_init,

	.exit = sh73a0_pinmux_soc_exit,

	.get_bias = sh73a0_pinmux_get_bias,

	.set_bias = sh73a0_pinmux_set_bias,

};