]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
phy: renesas: rcar-gen3-usb2: Simplify ID/VBUS detection logic
authorLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Wed, 25 Mar 2026 11:20:39 +0000 (11:20 +0000)
committerVinod Koul <vkoul@kernel.org>
Sun, 3 May 2026 17:05:57 +0000 (22:35 +0530)
Read USB2_ADPCTRL once in rcar_gen3_check_id() instead of issuing
multiple MMIO reads, and derive both IDDIG and VBUSVALID from the same
value.

Drop the redundant !! operator, as assigning a masked u32 value to a
bool already performs the required normalization. Simplify the logic by
comparing the ID and VBUS status directly, which is equivalent to the
previous conditional but easier to follow.

Reported-by: Pavel Machek <pavel@nabladev.com>
Closes: https://lore.kernel.org/all/acJVCOdlchLiSe5n@duo.ucw.cz/
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://patch.msgid.link/20260325112039.464992-1-prabhakar.mahadev-lad.rj@bp.renesas.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/renesas/phy-rcar-gen3-usb2.c

index 79e820e2fe55d8c06c8e24c4c710726779f13dab..9a45d840efeb2532af0966fb0c6e804c2f36e429 100644 (file)
@@ -314,13 +314,11 @@ static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch)
 static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
 {
        if (ch->phy_data->vblvl_ctrl) {
-               bool vbus_valid;
-               bool device;
+               u32 val = readl(ch->base + USB2_ADPCTRL);
+               bool vbus_valid = val & USB2_ADPCTRL_VBUSVALID;
+               bool device = val & USB2_ADPCTRL_IDDIG;
 
-               device = !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG);
-               vbus_valid = !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_VBUSVALID);
-
-               return vbus_valid ? device : !device;
+               return device == vbus_valid;
        }
 
        if (!ch->uses_otg_pins)