phy: renesas: rcar-gen3-usb2: Fix an error handling path in rcar_gen3_phy_usb2_probe()

If an error occurs after the reset_control_deassert(),
reset_control_assert() must be called, as already done in the remove
function.

Use devm_add_action_or_reset() to add the missing call and simplify the
.remove() function accordingly.

While at it, drop struct rcar_gen3_chan::rstc as it is not used aymore.

[claudiu.beznea: removed "struct reset_control *rstc = data;" from
 rcar_gen3_reset_assert(), dropped struct rcar_gen3_chan::rstc]

Fixes: 4eae16375357 ("phy: renesas: rcar-gen3-usb2: Add support to initialize the bus")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Link: https://patch.msgid.link/20251023135810.1688415-3-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index 3f6b480e10922950d884fbb3f401fe475f2aa7f3..a38ead7c8055d042ecd6651d13f810dce11f082c 100644 (file)
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -134,7 +134,6 @@ struct rcar_gen3_chan {
        struct extcon_dev *extcon;
        struct rcar_gen3_phy rphys[NUM_OF_PHYS];
        struct regulator *vbus;
-       struct reset_control *rstc;
        struct work_struct work;
        spinlock_t lock;        /* protects access to hardware and driver data structure. */
        enum usb_dr_mode dr_mode;
@@ -771,21 +770,31 @@ static enum usb_dr_mode rcar_gen3_get_dr_mode(struct device_node *np)
        return candidate;
 }
 
+static void rcar_gen3_reset_assert(void *data)
+{
+       reset_control_assert(data);
+}
+
 static int rcar_gen3_phy_usb2_init_bus(struct rcar_gen3_chan *channel)
 {
        struct device *dev = channel->dev;
+       struct reset_control *rstc;
        int ret;
        u32 val;
 
-       channel->rstc = devm_reset_control_array_get_shared(dev);
-       if (IS_ERR(channel->rstc))
-               return PTR_ERR(channel->rstc);
+       rstc = devm_reset_control_array_get_shared(dev);
+       if (IS_ERR(rstc))
+               return PTR_ERR(rstc);
 
        ret = pm_runtime_resume_and_get(dev);
        if (ret)
                return ret;
 
-       ret = reset_control_deassert(channel->rstc);
+       ret = reset_control_deassert(rstc);
+       if (ret)
+               goto rpm_put;
+
+       ret = devm_add_action_or_reset(dev, rcar_gen3_reset_assert, rstc);
        if (ret)
                goto rpm_put;
 
@@ -924,7 +933,6 @@ static void rcar_gen3_phy_usb2_remove(struct platform_device *pdev)
        if (channel->is_otg_channel)
                device_remove_file(&pdev->dev, &dev_attr_role);
 
-       reset_control_assert(channel->rstc);
        pm_runtime_disable(&pdev->dev);
 };