usb: dwc3: Fixup downstream for add of dwc pointer to dwc3_readl/writel

popcornmix · pelwell · commit 74c76fb243a8 · 2026-05-19T10:08:25.000+01:00
Signed-off-by: Dom Cobley &lt;popcornmix@gmail.com&gt;
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
@@ -1572,7 +1572,7 @@ int dwc3_core_init(struct dwc3 *dwc)
 		u8 tx_maxburst = dwc->tx_max_burst_prd;
 
 		if (tx_thr_num && tx_maxburst) {
-			reg = dwc3_readl(dwc->regs, DWC3_GTXTHRCFG);
+			reg = dwc3_readl(dwc, DWC3_GTXTHRCFG);
 			reg |= DWC3_GTXTHRCFG_PKTCNTSEL;
 
 			reg &= ~DWC3_GTXTHRCFG_TXPKTCNT(~0);
@@ -1581,7 +1581,7 @@ int dwc3_core_init(struct dwc3 *dwc)
 			reg &= ~DWC3_GTXTHRCFG_MAXTXBURSTSIZE(~0);
 			reg |= DWC3_GTXTHRCFG_MAXTXBURSTSIZE(tx_maxburst);
 
-			dwc3_writel(dwc->regs, DWC3_GTXTHRCFG, reg);
+			dwc3_writel(dwc, DWC3_GTXTHRCFG, reg);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1572,7 +1572,7 @@ int dwc3_core_init(struct dwc3 *dwc)`
`1572`	`1572`	`u8 tx_maxburst = dwc->tx_max_burst_prd;`
`1573`	`1573`
`1574`	`1574`	`if (tx_thr_num && tx_maxburst) {`
`1575`		`- reg = dwc3_readl(dwc->regs, DWC3_GTXTHRCFG);`
	`1575`	`+ reg = dwc3_readl(dwc, DWC3_GTXTHRCFG);`
`1576`	`1576`	`reg \|= DWC3_GTXTHRCFG_PKTCNTSEL;`
`1577`	`1577`
`1578`	`1578`	`reg &= ~DWC3_GTXTHRCFG_TXPKTCNT(~0);`
`@@ -1581,7 +1581,7 @@ int dwc3_core_init(struct dwc3 *dwc)`
`1581`	`1581`	`reg &= ~DWC3_GTXTHRCFG_MAXTXBURSTSIZE(~0);`
`1582`	`1582`	`reg \|= DWC3_GTXTHRCFG_MAXTXBURSTSIZE(tx_maxburst);`
`1583`	`1583`
`1584`		`- dwc3_writel(dwc->regs, DWC3_GTXTHRCFG, reg);`
	`1584`	`+ dwc3_writel(dwc, DWC3_GTXTHRCFG, reg);`
`1585`	`1585`	`}`
`1586`	`1586`	`}`
`1587`	`1587`