Skip to content

Commit 3d9e63c

Browse files
prabhakarladWolfram Sang
authored andcommitted
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: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> Reviewed-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Andy Shevchenko <andy@kernel.org> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
1 parent 7225216 commit 3d9e63c

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

drivers/i2c/busses/i2c-riic.c

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -423,11 +423,6 @@ static struct riic_irq_desc riic_irqs[] = {
423423
{ .res_num = 5, .isr = riic_tend_isr, .name = "riic-nack" },
424424
};
425425

426-
static void riic_reset_control_assert(void *data)
427-
{
428-
reset_control_assert(data);
429-
}
430-
431426
static int riic_i2c_probe(struct platform_device *pdev)
432427
{
433428
struct device *dev = &pdev->dev;
@@ -448,18 +443,10 @@ static int riic_i2c_probe(struct platform_device *pdev)
448443
return dev_err_probe(dev, PTR_ERR(riic->clk),
449444
"missing controller clock");
450445

451-
riic->rstc = devm_reset_control_get_optional_exclusive(dev, NULL);
446+
riic->rstc = devm_reset_control_get_optional_exclusive_deasserted(dev, NULL);
452447
if (IS_ERR(riic->rstc))
453448
return dev_err_probe(dev, PTR_ERR(riic->rstc),
454-
"Error: missing reset ctrl\n");
455-
456-
ret = reset_control_deassert(riic->rstc);
457-
if (ret)
458-
return ret;
459-
460-
ret = devm_add_action_or_reset(dev, riic_reset_control_assert, riic->rstc);
461-
if (ret)
462-
return ret;
449+
"failed to acquire deasserted reset\n");
463450

464451
for (i = 0; i < ARRAY_SIZE(riic_irqs); i++) {
465452
int irq;

0 commit comments

Comments
 (0)