Commit 3d9e63c3 authored by Lad Prabhakar's avatar Lad Prabhakar Committed by Wolfram Sang
Browse files

i2c: riic: Make use of devres helper to request deasserted reset line 



Simplify the `riic_i2c_probe()` function by using the
`devm_reset_control_get_optional_exclusive_deasserted()` API to request a
deasserted reset line. This eliminates the need to manually deassert the
reset control and the additional cleanup.

Signed-off-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: default avatarClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
parent 72252162

drivers/i2c/busses/i2c-riic.c

+2 −15
Original line number Diff line number Diff line
@@ -423,11 +423,6 @@ static struct riic_irq_desc riic_irqs[] = { 
	{ .res_num = 5, .isr = riic_tend_isr, .name = "riic-nack" },

};



static void riic_reset_control_assert(void *data)

{

	reset_control_assert(data);

}



static int riic_i2c_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -448,18 +443,10 @@ static int riic_i2c_probe(struct platform_device *pdev) 
		return dev_err_probe(dev, PTR_ERR(riic->clk),

				     "missing controller clock");



	riic->rstc = devm_reset_control_get_optional_exclusive(dev, NULL);

	riic->rstc = devm_reset_control_get_optional_exclusive_deasserted(dev, NULL);

	if (IS_ERR(riic->rstc))

		return dev_err_probe(dev, PTR_ERR(riic->rstc),

				     "Error: missing reset ctrl\n");



	ret = reset_control_deassert(riic->rstc);

	if (ret)

		return ret;



	ret = devm_add_action_or_reset(dev, riic_reset_control_assert, riic->rstc);

	if (ret)

		return ret;

				     "failed to acquire deasserted reset\n");



	for (i = 0; i < ARRAY_SIZE(riic_irqs); i++) {

		int irq;