Commit 097d9d41 authored Oct 04, 2021 by Uwe Kleine-König Committed by Bjorn Helgaas Oct 12, 2021

PCI: Drop pci_device_remove() test of pci_dev->driver

When the driver core calls pci_device_remove(), there is a driver bound
to the device, so pci_dev->driver is never NULL.

Remove the unnecessary test of pci_dev->driver.

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


Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

parent 8e9028b3

drivers/pci/pci-driver.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -459,7 +459,6 @@ static void pci_device_remove(struct device *dev)
		struct pci_dev *pci_dev = to_pci_dev(dev);
		struct pci_driver *drv = pci_dev->driver;

		if (drv) {
		if (drv->remove) {
		pm_runtime_get_sync(dev);
		drv->remove(pci_dev);
		@@ -468,7 +467,6 @@ static void pci_device_remove(struct device *dev)
		pcibios_free_irq(pci_dev);
		pci_dev->driver = NULL;
		pci_iov_remove(pci_dev);
		}

		/* Undo the runtime PM settings in local_pci_probe() */
		pm_runtime_put_sync(dev);