---

yaml
---
r: 180991
b: refs/heads/master
c: 552be54
h: refs/heads/master
i:
  180989: 3e7a995
  180987: 680f6eb
  180983: ba37564
  180975: 2e5a51e
  180959: baed09b
  180927: 3de6911
  180863: c604f44
  180735: fe63ced
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b67ea76172d4b1922c4b3c46c8ea8e9fec1ff38c
+refs/heads/master: 552be54cc4232dc5acc49ccb372129d6f1b6923f

trunk/drivers/pci/pcie/pme/pcie_pme.c

@@ -144,7 +144,7 @@ static bool pcie_pme_walk_bus(struct pci_bus *bus)
 
 	list_for_each_entry(dev, &bus->devices, bus_list) {
 		/* Skip PCIe devices in case we started from a root port. */
-		if (!dev->is_pcie && pci_check_pme_status(dev)) {
+		if (!pci_is_pcie(dev) && pci_check_pme_status(dev)) {
 			pm_request_resume(&dev->dev);
 			ret = true;
 		}
@@ -177,7 +177,7 @@ static bool pcie_pme_from_pci_bridge(struct pci_bus *bus, u8 devfn)
 	if (!dev)
 		return false;
 
-	if (dev->is_pcie && dev->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE) {
+	if (pci_is_pcie(dev) && dev->pcie_type == PCI_EXP_TYPE_PCI_BRIDGE) {
 		down_read(&pci_bus_sem);
 		if (pcie_pme_walk_bus(bus))
 			found = true;
@@ -389,7 +389,7 @@ static void pcie_pme_mark_devices(struct pci_dev *port)
 
 		down_read(&pci_bus_sem);
 		list_for_each_entry(dev, &bus->devices, bus_list)
-			if (dev->is_pcie
+			if (pci_is_pcie(dev)
 			    && dev->pcie_type == PCI_EXP_TYPE_RC_END)
 				pcie_pme_set_native(dev, NULL);
 		up_read(&pci_bus_sem);