From: Geert Uytterhoeven Date: Thu, 5 Mar 2026 10:15:28 +0000 (+0100) Subject: phy: renesas: rzg3e-usb3: Convert to FIELD_MODIFY() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cfeef97f21be61372d718f7ee430ea65536bb08;p=thirdparty%2Fkernel%2Fstable.git phy: renesas: rzg3e-usb3: Convert to FIELD_MODIFY() Use the FIELD_MODIFY() helper instead of open-coding the same operation. Signed-off-by: Geert Uytterhoeven Reviewed-by: Neil Armstrong Link: https://patch.msgid.link/a52020ba597e2e213b161eee21239f10e6057d9d.1772705690.git.geert+renesas@glider.be Signed-off-by: Vinod Koul --- diff --git a/drivers/phy/renesas/phy-rzg3e-usb3.c b/drivers/phy/renesas/phy-rzg3e-usb3.c index 030c600a53e6..060309547ea5 100644 --- a/drivers/phy/renesas/phy-rzg3e-usb3.c +++ b/drivers/phy/renesas/phy-rzg3e-usb3.c @@ -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);