On 15-10-24, 14:42, Greg Kroah-Hartman wrote: > 5.10-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Moritz Fischer <mdf@xxxxxxxxxx> > > [ Upstream commit 884c274408296e7e0f56545f909b3d3a671104aa ] > > Remove empty function renesas_xhci_pci_exit() that does not > actually do anything. Does this really belong to stable? Removing an empty function should not be ported to stable kernels right...? > > Cc: Mathias Nyman <mathias.nyman@xxxxxxxxx> > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Cc: Vinod Koul <vkoul@xxxxxxxxxx> > Signed-off-by: Moritz Fischer <mdf@xxxxxxxxxx> > Link: https://lore.kernel.org/r/20210718015111.389719-3-mdf@xxxxxxxxxx > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > Stable-dep-of: f81dfa3b57c6 ("xhci: Set quirky xHC PCI hosts to D3 _after_ stopping and freeing them.") > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > drivers/usb/host/xhci-pci-renesas.c | 5 ----- > drivers/usb/host/xhci-pci.c | 2 -- > drivers/usb/host/xhci-pci.h | 3 --- > 3 files changed, 10 deletions(-) > > diff --git a/drivers/usb/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c > index 96692dbbd4dad..01ad6fc1adcaf 100644 > --- a/drivers/usb/host/xhci-pci-renesas.c > +++ b/drivers/usb/host/xhci-pci-renesas.c > @@ -631,9 +631,4 @@ int renesas_xhci_check_request_fw(struct pci_dev *pdev, > } > EXPORT_SYMBOL_GPL(renesas_xhci_check_request_fw); > > -void renesas_xhci_pci_exit(struct pci_dev *dev) > -{ > -} > -EXPORT_SYMBOL_GPL(renesas_xhci_pci_exit); > - > MODULE_LICENSE("GPL v2"); > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c > index 88f223b975d34..4a88e75cd9586 100644 > --- a/drivers/usb/host/xhci-pci.c > +++ b/drivers/usb/host/xhci-pci.c > @@ -533,8 +533,6 @@ static void xhci_pci_remove(struct pci_dev *dev) > struct xhci_hcd *xhci; > > xhci = hcd_to_xhci(pci_get_drvdata(dev)); > - if (xhci->quirks & XHCI_RENESAS_FW_QUIRK) > - renesas_xhci_pci_exit(dev); > > xhci->xhc_state |= XHCI_STATE_REMOVING; > > diff --git a/drivers/usb/host/xhci-pci.h b/drivers/usb/host/xhci-pci.h > index acd7cf0a1706e..cb9a8f331a446 100644 > --- a/drivers/usb/host/xhci-pci.h > +++ b/drivers/usb/host/xhci-pci.h > @@ -7,7 +7,6 @@ > #if IS_ENABLED(CONFIG_USB_XHCI_PCI_RENESAS) > int renesas_xhci_check_request_fw(struct pci_dev *dev, > const struct pci_device_id *id); > -void renesas_xhci_pci_exit(struct pci_dev *dev); > > #else > static int renesas_xhci_check_request_fw(struct pci_dev *dev, > @@ -16,8 +15,6 @@ static int renesas_xhci_check_request_fw(struct pci_dev *dev, > return 0; > } > > -static void renesas_xhci_pci_exit(struct pci_dev *dev) { }; > - > #endif > > struct xhci_driver_data { > -- > 2.43.0 > > -- ~Vinod
