Unverified Commit 77f79ac8 authored by Philipp Stanner's avatar Philipp Stanner Committed by Krzysztof Wilczyński
Browse files

PCI: Remove struct pci_devres.enabled status bit 

The struct pci_devres has a separate boolean to track whether a device is
enabled. That, however, can easily be tracked in an agnostic manner through
the function pci_is_enabled().

Using it allows for simplifying the PCI devres implementation.

Replace the separate 'enabled' status bit from struct pci_devres with
calls to pci_is_enabled() at the appropriate places.

Link: https://lore.kernel.org/r/20240613115032.29098-8-pstanner@redhat.com


Signed-off-by: default avatarPhilipp Stanner <pstanner@redhat.com>
Signed-off-by: default avatarKrzysztof Wilczyński <kwilczynski@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 81fcf28e

drivers/pci/devres.c

+4 −7
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static void pcim_release(struct device *gendev, void *res) 
	if (this->restore_intx)

		pci_intx(dev, this->orig_intx);



	if (this->enabled && !this->pinned)

	if (pci_is_enabled(dev) && !this->pinned)

		pci_disable_device(dev);

}
@@ -450,14 +450,11 @@ int pcim_enable_device(struct pci_dev *pdev) 
	dr = get_pci_dr(pdev);

	if (unlikely(!dr))

		return -ENOMEM;

	if (dr->enabled)

		return 0;



	rc = pci_enable_device(pdev);

	if (!rc) {

	if (!rc)

		pdev->is_managed = 1;

		dr->enabled = 1;

	}



	return rc;

}

EXPORT_SYMBOL(pcim_enable_device);
@@ -475,7 +472,7 @@ void pcim_pin_device(struct pci_dev *pdev) 
	struct pci_devres *dr;



	dr = find_pci_dr(pdev);

	WARN_ON(!dr || !dr->enabled);

	WARN_ON(!dr || !pci_is_enabled(pdev));

	if (dr)

		dr->pinned = 1;

}

drivers/pci/pci.c

+0 −6
Original line number Diff line number Diff line
@@ -2218,12 +2218,6 @@ void pci_disable_enabled_device(struct pci_dev *dev) 
 */

void pci_disable_device(struct pci_dev *dev)

{

	struct pci_devres *dr;



	dr = find_pci_dr(dev);

	if (dr)

		dr->enabled = 0;



	dev_WARN_ONCE(&dev->dev, atomic_read(&dev->enable_cnt) <= 0,

		      "disabling already-disabled device");

drivers/pci/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -821,7 +821,6 @@ static inline pci_power_t mid_pci_get_power_state(struct pci_dev *pdev) 
 * then remove them from here.

 */

struct pci_devres {

	unsigned int enabled:1;

	unsigned int pinned:1;

	unsigned int orig_intx:1;

	unsigned int restore_intx:1;