]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: dwc3: Use FIELD_MODIFY()
authorHans Zhang <18255117159@163.com>
Thu, 30 Apr 2026 16:39:14 +0000 (00:39 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 May 2026 14:43:04 +0000 (16:43 +0200)
Use FIELD_MODIFY() to remove open-coded bit manipulation.
No functional change intended.

Signed-off-by: Hans Zhang <18255117159@163.com>
Link: https://patch.msgid.link/20260430163919.47372-2-18255117159@163.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/dwc3/core.c

index a2587f9f0bb8a26f17a021e2028cd5a8d57f1035..517aa7f1486da6c2f1bb976c0faa7881a2a3a0c3 100644 (file)
@@ -425,8 +425,7 @@ static void dwc3_ref_clk_period(struct dwc3 *dwc)
        }
 
        reg = dwc3_readl(dwc, DWC3_GUCTL);
-       reg &= ~DWC3_GUCTL_REFCLKPER_MASK;
-       reg |=  FIELD_PREP(DWC3_GUCTL_REFCLKPER_MASK, period);
+       FIELD_MODIFY(DWC3_GUCTL_REFCLKPER_MASK, &reg, period);
        dwc3_writel(dwc, DWC3_GUCTL, reg);
 
        if (DWC3_VER_IS_PRIOR(DWC3, 250A))
@@ -456,12 +455,9 @@ static void dwc3_ref_clk_period(struct dwc3 *dwc)
        decr = 480000000 / rate;
 
        reg = dwc3_readl(dwc, DWC3_GFLADJ);
-       reg &= ~DWC3_GFLADJ_REFCLK_FLADJ_MASK
-           &  ~DWC3_GFLADJ_240MHZDECR
-           &  ~DWC3_GFLADJ_240MHZDECR_PLS1;
-       reg |= FIELD_PREP(DWC3_GFLADJ_REFCLK_FLADJ_MASK, fladj)
-           |  FIELD_PREP(DWC3_GFLADJ_240MHZDECR, decr >> 1)
-           |  FIELD_PREP(DWC3_GFLADJ_240MHZDECR_PLS1, decr & 1);
+       FIELD_MODIFY(DWC3_GFLADJ_REFCLK_FLADJ_MASK, &reg, fladj);
+       FIELD_MODIFY(DWC3_GFLADJ_240MHZDECR, &reg, decr >> 1);
+       FIELD_MODIFY(DWC3_GFLADJ_240MHZDECR_PLS1, &reg, decr & 1);
 
        if (dwc->gfladj_refclk_lpm_sel)
                reg |=  DWC3_GFLADJ_REFCLK_LPM_SEL;