]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
phy: renesas: rzg3e-usb3: Convert to FIELD_MODIFY()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 5 Mar 2026 10:15:28 +0000 (11:15 +0100)
committerVinod Koul <vkoul@kernel.org>
Sun, 10 May 2026 12:17:45 +0000 (17:47 +0530)
Use the FIELD_MODIFY() helper instead of open-coding the same operation.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patch.msgid.link/a52020ba597e2e213b161eee21239f10e6057d9d.1772705690.git.geert+renesas@glider.be
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/renesas/phy-rzg3e-usb3.c

index 030c600a53e67dd477216860d77e7a1c7b9ee4f2..060309547ea5277a7b542bb4b627390eefe61199 100644 (file)
@@ -78,13 +78,11 @@ static void rzg3e_phy_usb2test_phy_init(void __iomem *base)
        writel(val, base + USB3_TEST_UTMICTRL2);
 
        val = readl(base + USB3_TEST_PRMCTRL5_R);
-       val &= ~USB3_TEST_PRMCTRL5_R_TXPREEMPAMPTUNE0_MASK;
-       val |= FIELD_PREP(USB3_TEST_PRMCTRL5_R_TXPREEMPAMPTUNE0_MASK, 2);
+       FIELD_MODIFY(USB3_TEST_PRMCTRL5_R_TXPREEMPAMPTUNE0_MASK, &val, 2);
        writel(val, base + USB3_TEST_PRMCTRL5_R);
 
        val = readl(base + USB3_TEST_PRMCTRL6_R);
-       val &= ~USB3_TEST_PRMCTRL6_R_OTGTUNE0_MASK;
-       val |= FIELD_PREP(USB3_TEST_PRMCTRL6_R_OTGTUNE0_MASK, 7);
+       FIELD_MODIFY(USB3_TEST_PRMCTRL6_R_OTGTUNE0_MASK, &val, 7);
        writel(val, base + USB3_TEST_PRMCTRL6_R);
 
        val = readl(base + USB3_TEST_RESET);