]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
phy: renesas: rcar-gen3-usb2: Move phy_data->init_bus check
authorClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Wed, 19 Nov 2025 12:04:17 +0000 (14:04 +0200)
committerVinod Koul <vkoul@kernel.org>
Thu, 20 Nov 2025 16:44:42 +0000 (22:14 +0530)
Move the check of phy_data->init_bus from rcar_gen3_phy_usb2_init_bus()
to rcar_gen3_phy_usb2_probe() to avoid having it duplicated in both the
probe path and the upcoming resume code. This is a preparatory patch.

Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patch.msgid.link/20251119120418.686224-2-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/renesas/phy-rcar-gen3-usb2.c

index a38ead7c8055d042ecd6651d13f810dce11f082c..b9d5bb52e02c534bd4ce433da4c8a85a86be9e02 100644 (file)
@@ -782,6 +782,9 @@ static int rcar_gen3_phy_usb2_init_bus(struct rcar_gen3_chan *channel)
        int ret;
        u32 val;
 
+       if (!channel->phy_data->init_bus)
+               return 0;
+
        rstc = devm_reset_control_array_get_shared(dev);
        if (IS_ERR(rstc))
                return PTR_ERR(rstc);
@@ -861,11 +864,9 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, channel);
        channel->dev = dev;
 
-       if (channel->phy_data->init_bus) {
-               ret = rcar_gen3_phy_usb2_init_bus(channel);
-               if (ret)
-                       goto error;
-       }
+       ret = rcar_gen3_phy_usb2_init_bus(channel);
+       if (ret)
+               goto error;
 
        spin_lock_init(&channel->lock);
        for (i = 0; i < NUM_OF_PHYS; i++) {