| Message ID | 5e9068fa44ca2b11eaed5ee051a20dca50f90769.camel@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | usb: xhci: Load Raspberry Pi 4 VL805's firmware | expand |
On 09/07/2020 19:31, Nicolas Saenz Julienne wrote: > This was breaking build on some configurations. > > Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de> > --- > > Matthias, I don't know if it's possible at this stage, but I'd ideally squash > this into the offending patch. I'll test the patch and squash. Thanks! > > drivers/usb/host/xhci.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c > index e252964d0d..f635bb39f6 100644 > --- a/drivers/usb/host/xhci.c > +++ b/drivers/usb/host/xhci.c > @@ -190,6 +190,7 @@ static int xhci_start(struct xhci_hcor *hcor) > return ret; > } > > +#if CONFIG_IS_ENABLED(DM_USB) > /** > * Resets XHCI Hardware > * > @@ -218,6 +219,7 @@ static int xhci_reset_hw(struct xhci_ctrl *ctrl) > > return 0; > } > +#endif > > /** > * Resets the XHCI Controller >
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index e252964d0d..f635bb39f6 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -190,6 +190,7 @@ static int xhci_start(struct xhci_hcor *hcor) return ret; } +#if CONFIG_IS_ENABLED(DM_USB) /** * Resets XHCI Hardware * @@ -218,6 +219,7 @@ static int xhci_reset_hw(struct xhci_ctrl *ctrl) return 0; } +#endif /** * Resets the XHCI Controller
This was breaking build on some configurations. Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne at suse.de> --- Matthias, I don't know if it's possible at this stage, but I'd ideally squash this into the offending patch. drivers/usb/host/xhci.c | 2 ++ 1 file changed, 2 insertions(+)