Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 326c1cda authored by Yijing Wang's avatar Yijing Wang Committed by Bjorn Helgaas
Browse files

PCI: Rename pci_is_bridge() to pci_has_subordinate() 



Previously, pci_is_bridge() returned true only when a subordinate bus
existed.  Rename pci_is_bridge() to pci_has_subordinate() to better
indicate what we're checking.

No functional change.

[bhelgaas: changelog]
Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent c9eaa447

drivers/pci/pci-driver.c

+4 −4
Original line number Diff line number Diff line
@@ -580,14 +580,14 @@ static void pci_pm_default_resume(struct pci_dev *pci_dev) 
{

	pci_fixup_device(pci_fixup_resume, pci_dev);



	if (!pci_is_bridge(pci_dev))

	if (!pci_has_subordinate(pci_dev))

		pci_enable_wake(pci_dev, PCI_D0, false);

}



static void pci_pm_default_suspend(struct pci_dev *pci_dev)

{

	/* Disable non-bridge devices without PM support */

	if (!pci_is_bridge(pci_dev))

	if (!pci_has_subordinate(pci_dev))

		pci_disable_enabled_device(pci_dev);

}
@@ -717,7 +717,7 @@ static int pci_pm_suspend_noirq(struct device *dev) 


	if (!pci_dev->state_saved) {

		pci_save_state(pci_dev);

		if (!pci_is_bridge(pci_dev))

		if (!pci_has_subordinate(pci_dev))

			pci_prepare_to_sleep(pci_dev);

	}
@@ -971,7 +971,7 @@ static int pci_pm_poweroff_noirq(struct device *dev) 
			return error;

	}



	if (!pci_dev->state_saved && !pci_is_bridge(pci_dev))

	if (!pci_dev->state_saved && !pci_has_subordinate(pci_dev))

		pci_prepare_to_sleep(pci_dev);



	/*

drivers/pci/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static inline void pci_wakeup_event(struct pci_dev *dev) 
	pm_wakeup_event(&dev->dev, 100);

}



static inline bool pci_is_bridge(struct pci_dev *pci_dev)

static inline bool pci_has_subordinate(struct pci_dev *pci_dev)

{

	return !!(pci_dev->subordinate);

}