| Message ID | 20211122123107.3147353-1-john@metanate.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c4bc515d73b5201d30f78b935accdd9e3988f05e |
| Headers | show |
| Series | usb: dwc2: gadget: use existing helper | expand |
On 11/22/2021 4:31 PM, John Keeping wrote: > All other checks of params.g_dma_desc in this file use the > using_desc_dma() helper function. Use that helper in two more places > for consistency throughout the file. > > Signed-off-by: John Keeping <john@metanate.com> Acked-by: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com> > --- > drivers/usb/dwc2/gadget.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c > index ab8d7dad9f567..b884a83b26a6e 100644 > --- a/drivers/usb/dwc2/gadget.c > +++ b/drivers/usb/dwc2/gadget.c > @@ -5217,7 +5217,7 @@ int dwc2_restore_device_registers(struct dwc2_hsotg *hsotg, int remote_wakeup) > * as result BNA interrupt asserted on hibernation exit > * by restoring from saved area. > */ > - if (hsotg->params.g_dma_desc && > + if (using_desc_dma(hsotg) && > (dr->diepctl[i] & DXEPCTL_EPENA)) > dr->diepdma[i] = hsotg->eps_in[i]->desc_list_dma; > dwc2_writel(hsotg, dr->dtxfsiz[i], DPTXFSIZN(i)); > @@ -5229,7 +5229,7 @@ int dwc2_restore_device_registers(struct dwc2_hsotg *hsotg, int remote_wakeup) > * as result BNA interrupt asserted on hibernation exit > * by restoring from saved area. > */ > - if (hsotg->params.g_dma_desc && > + if (using_desc_dma(hsotg) && > (dr->doepctl[i] & DXEPCTL_EPENA)) > dr->doepdma[i] = hsotg->eps_out[i]->desc_list_dma; > dwc2_writel(hsotg, dr->doepdma[i], DOEPDMA(i)); >
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index ab8d7dad9f567..b884a83b26a6e 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -5217,7 +5217,7 @@ int dwc2_restore_device_registers(struct dwc2_hsotg *hsotg, int remote_wakeup) * as result BNA interrupt asserted on hibernation exit * by restoring from saved area. */ - if (hsotg->params.g_dma_desc && + if (using_desc_dma(hsotg) && (dr->diepctl[i] & DXEPCTL_EPENA)) dr->diepdma[i] = hsotg->eps_in[i]->desc_list_dma; dwc2_writel(hsotg, dr->dtxfsiz[i], DPTXFSIZN(i)); @@ -5229,7 +5229,7 @@ int dwc2_restore_device_registers(struct dwc2_hsotg *hsotg, int remote_wakeup) * as result BNA interrupt asserted on hibernation exit * by restoring from saved area. */ - if (hsotg->params.g_dma_desc && + if (using_desc_dma(hsotg) && (dr->doepctl[i] & DXEPCTL_EPENA)) dr->doepdma[i] = hsotg->eps_out[i]->desc_list_dma; dwc2_writel(hsotg, dr->doepdma[i], DOEPDMA(i));
All other checks of params.g_dma_desc in this file use the using_desc_dma() helper function. Use that helper in two more places for consistency throughout the file. Signed-off-by: John Keeping <john@metanate.com> --- drivers/usb/dwc2/gadget.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)