Commit b5f9c644 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Bjorn Helgaas
Browse files

PCI: Remove struct pci_dev->driver 

There are no remaining uses of the struct pci_dev->driver pointer, so
remove it.

Link: https://lore.kernel.org/r/20211004125935.2300113-12-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 2a4d9408

drivers/pci/pci-driver.c

+0 −4
Original line number Diff line number Diff line
@@ -319,12 +319,10 @@ static long local_pci_probe(void *_ddi) 
	 * its remove routine.

	 */

	pm_runtime_get_sync(dev);

	pci_dev->driver = pci_drv;

	rc = pci_drv->probe(pci_dev, ddi->id);

	if (!rc)

		return rc;

	if (rc < 0) {

		pci_dev->driver = NULL;

		pm_runtime_put_sync(dev);

		return rc;

	}
@@ -390,7 +388,6 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, 
 * @pci_dev: PCI device being probed

 *

 * returns 0 on success, else error.

 * side-effect: pci_dev->driver is set to drv when drv claims pci_dev.

 */

static int __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)

{
@@ -465,7 +462,6 @@ static void pci_device_remove(struct device *dev) 
		pm_runtime_put_noidle(dev);

	}

	pcibios_free_irq(pci_dev);

	pci_dev->driver = NULL;

	pci_iov_remove(pci_dev);



	/* Undo the runtime PM settings in local_pci_probe() */

include/linux/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -342,7 +342,6 @@ struct pci_dev { 
	u16		pcie_flags_reg;	/* Cached PCIe Capabilities Register */

	unsigned long	*dma_alias_mask;/* Mask of enabled devfn aliases */



	struct pci_driver *driver;	/* Driver bound to this device */

	u64		dma_mask;	/* Mask of the bits of bus address this

					   device implements.  Normally this is

					   0xffffffff.  You only need to change