Skip to content

Commit b5f9c64

Browse files
Uwe Kleine-Königbjorn-helgaas
authored andcommitted
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/[email protected] Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent 2a4d940 commit b5f9c64

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

drivers/pci/pci-driver.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,10 @@ static long local_pci_probe(void *_ddi)
319319
* its remove routine.
320320
*/
321321
pm_runtime_get_sync(dev);
322-
pci_dev->driver = pci_drv;
323322
rc = pci_drv->probe(pci_dev, ddi->id);
324323
if (!rc)
325324
return rc;
326325
if (rc < 0) {
327-
pci_dev->driver = NULL;
328326
pm_runtime_put_sync(dev);
329327
return rc;
330328
}
@@ -390,7 +388,6 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
390388
* @pci_dev: PCI device being probed
391389
*
392390
* returns 0 on success, else error.
393-
* side-effect: pci_dev->driver is set to drv when drv claims pci_dev.
394391
*/
395392
static int __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
396393
{
@@ -465,7 +462,6 @@ static void pci_device_remove(struct device *dev)
465462
pm_runtime_put_noidle(dev);
466463
}
467464
pcibios_free_irq(pci_dev);
468-
pci_dev->driver = NULL;
469465
pci_iov_remove(pci_dev);
470466

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

include/linux/pci.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ struct pci_dev {
342342
u16 pcie_flags_reg; /* Cached PCIe Capabilities Register */
343343
unsigned long *dma_alias_mask;/* Mask of enabled devfn aliases */
344344

345-
struct pci_driver *driver; /* Driver bound to this device */
346345
u64 dma_mask; /* Mask of the bits of bus address this
347346
device implements. Normally this is
348347
0xffffffff. You only need to change

0 commit comments

Comments
 (0)