hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: hcd-pci: Drop the unused id parameter from usb_hcd_pci_probe()

Browse Source 
Since the HC driver is now passed to the function with its
own parameter (it used to be picked from id->driver_data),
the id parameter serves no purpose.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20220831125052.71584-1-heikki.krogerus@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Heikki Krogerus 2022-08-31 15:50:52 +03:00 committed by Greg Kroah-Hartman
parent a4efdb8a42
commit 4e55e22d3d
6 changed files with 5 additions and 11 deletions
drivers/usb
core
hcd-pci.c
host
ehci-pci.cohci-pci.cuhci-pci.cxhci-pci.c
include/linux/usb
hcd.h

7
drivers/usb/core/hcd-pci.c

@ -157,7 +157,6 @@ static void ehci_wait_for_companions(struct pci_dev *pdev, struct usb_hcd *hcd,
/** /**
* usb_hcd_pci_probe - initialize PCI-based HCDs * usb_hcd_pci_probe - initialize PCI-based HCDs
* @dev: USB Host Controller being probed * @dev: USB Host Controller being probed
* @id: pci hotplug id connecting controller to HCD framework
* @driver: USB HC driver handle * @driver: USB HC driver handle
* *
* Context: task context, might sleep * Context: task context, might sleep
@ -170,8 +169,7 @@ static void ehci_wait_for_companions(struct pci_dev *pdev, struct usb_hcd *hcd,
* *
* Return: 0 if successful. * Return: 0 if successful.
*/ */
int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id, int usb_hcd_pci_probe(struct pci_dev *dev, const struct hc_driver *driver)
const struct hc_driver *driver)
{ {
struct usb_hcd *hcd; struct usb_hcd *hcd;
int retval; int retval;
@ -180,9 +178,6 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id,
if (usb_disabled()) if (usb_disabled())
return -ENODEV; return -ENODEV;
if (!id)
return -EINVAL;
if (!driver) if (!driver)
return -EINVAL; return -EINVAL;

2
drivers/usb/host/ehci-pci.c

@ -382,7 +382,7 @@ static int ehci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
if (is_bypassed_id(pdev)) if (is_bypassed_id(pdev))
return -ENODEV; return -ENODEV;
return usb_hcd_pci_probe(pdev, id, &ehci_pci_hc_driver); return usb_hcd_pci_probe(pdev, &ehci_pci_hc_driver);
} }
static void ehci_pci_remove(struct pci_dev *pdev) static void ehci_pci_remove(struct pci_dev *pdev)

2
drivers/usb/host/ohci-pci.c

@ -282,7 +282,7 @@ MODULE_DEVICE_TABLE (pci, pci_ids);
static int ohci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) static int ohci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
return usb_hcd_pci_probe(dev, id, &ohci_pci_hc_driver); return usb_hcd_pci_probe(dev, &ohci_pci_hc_driver);
} }
/* pci driver glue; this is a "new style" PCI driver module */ /* pci driver glue; this is a "new style" PCI driver module */

2
drivers/usb/host/uhci-pci.c

@ -294,7 +294,7 @@ MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
static int uhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) static int uhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
return usb_hcd_pci_probe(dev, id, &uhci_driver); return usb_hcd_pci_probe(dev, &uhci_driver);
} }
static struct pci_driver uhci_pci_driver = { static struct pci_driver uhci_pci_driver = {

2
drivers/usb/host/xhci-pci.c

@ -431,7 +431,7 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
* to say USB 2.0, but I'm not sure what the implications would be in * to say USB 2.0, but I'm not sure what the implications would be in
* the other parts of the HCD code. * the other parts of the HCD code.
*/ */
retval = usb_hcd_pci_probe(dev, id, &xhci_pci_hc_driver); retval = usb_hcd_pci_probe(dev, &xhci_pci_hc_driver);
if (retval) if (retval)
goto put_runtime_pm; goto put_runtime_pm;

1
include/linux/usb/hcd.h

@ -479,7 +479,6 @@ static inline int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
struct pci_dev; struct pci_dev;
struct pci_device_id; struct pci_device_id;
extern int usb_hcd_pci_probe(struct pci_dev *dev, extern int usb_hcd_pci_probe(struct pci_dev *dev,
const struct pci_device_id *id,
const struct hc_driver *driver); const struct hc_driver *driver);
extern void usb_hcd_pci_remove(struct pci_dev *dev); extern void usb_hcd_pci_remove(struct pci_dev *dev);
extern void usb_hcd_pci_shutdown(struct pci_dev *dev); extern void usb_hcd_pci_shutdown(struct pci_dev *dev);