On Mon, Oct 16, 2023 at 08:11:10PM -0700, Bjorn Andersson wrote: > In preparation for the introduction of a direct reference to the struct > dwc3 in the dwc3_qcom struct, rename the generically named "dwc3" to > reduce the risk for confusion. > > No functional change. > > Signed-off-by: Bjorn Andersson <quic_bjorande@xxxxxxxxxxx> > --- > drivers/usb/dwc3/dwc3-qcom.c | 46 ++++++++++++++++++++++---------------------- > 1 file changed, 23 insertions(+), 23 deletions(-) > > diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c > index 3de43df6bbe8..a31c3bc1f56e 100644 > --- a/drivers/usb/dwc3/dwc3-qcom.c > +++ b/drivers/usb/dwc3/dwc3-qcom.c > @@ -67,7 +67,7 @@ struct dwc3_acpi_pdata { > struct dwc3_qcom { > struct device *dev; > void __iomem *qscratch_base; > - struct platform_device *dwc3; > + struct platform_device *dwc_dev; Since "dev" is so overloaded, please name this one "dwc_pdev" instead. > struct platform_device *urs_usb; > struct clk **clks; > int num_clocks; > static enum usb_device_speed dwc3_qcom_read_usb2_speed(struct dwc3_qcom *qcom) > { > - struct dwc3 *dwc = platform_get_drvdata(qcom->dwc3); > + struct dwc3 *dwc = platform_get_drvdata(qcom->dwc_dev); > struct usb_device *udev; > struct usb_hcd __maybe_unused *hcd; > > @@ -486,7 +486,7 @@ static int dwc3_qcom_resume(struct dwc3_qcom *qcom, bool wakeup) > static irqreturn_t qcom_dwc3_resume_irq(int irq, void *data) > { > struct dwc3_qcom *qcom = data; > - struct dwc3 *dwc = platform_get_drvdata(qcom->dwc3); > + struct dwc3 *dwc = platform_get_drvdata(qcom->dwc_dev); Perhaps you can drop the tab while changing this line. Johan