Commit 4e55e22d authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20220831125052.71584-1-heikki.krogerus@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4efdb8a

drivers/usb/core/hcd-pci.c

+1 −6
Original line number Diff line number Diff line
@@ -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

 * @dev: USB Host Controller being probed

 * @id: pci hotplug id connecting controller to HCD framework

 * @driver: USB HC driver handle

 *

 * 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.

 */

int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id,

		      const struct hc_driver *driver)

int usb_hcd_pci_probe(struct pci_dev *dev, const struct hc_driver *driver)

{

	struct usb_hcd		*hcd;

	int			retval;
@@ -180,9 +178,6 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id, 
	if (usb_disabled())

		return -ENODEV;



	if (!id)

		return -EINVAL;



	if (!driver)

		return -EINVAL;

drivers/usb/host/ehci-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static int ehci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
{

	if (is_bypassed_id(pdev))

		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)

drivers/usb/host/ohci-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

	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 */

drivers/usb/host/uhci-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

	return usb_hcd_pci_probe(dev, id, &uhci_driver);

	return usb_hcd_pci_probe(dev, &uhci_driver);

}



static struct pci_driver uhci_pci_driver = {

drivers/usb/host/xhci-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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

	 * 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)

		goto put_runtime_pm;