From 5bc9046d9e542eddf37917b1ee1854ec60bd1041 Mon Sep 17 00:00:00 2001
From: Myron Stowe <myron.stowe@redhat.com>
Date: Fri, 1 Jun 2012 15:16:31 -0600
Subject: [PATCH] --- yaml --- r: 316469 b: refs/heads/master c:
 cb97ae3485955401d637bd269b0d24d3cd3fd3ec h: refs/heads/master i:   316467:
 d0afe7de764d22bb4c3e6d37c0813ecd68e78fb1 v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/pci/pci.c | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 756439092707..c586e4095e3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c32823f82b42abc1f08b365085862fd1d57c0b61
+refs/heads/master: cb97ae3485955401d637bd269b0d24d3cd3fd3ec
diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c
index 847e0c35cdb7..766bb13bb0a3 100644
--- a/trunk/drivers/pci/pci.c
+++ b/trunk/drivers/pci/pci.c
@@ -1994,7 +1994,7 @@ void pci_enable_ari(struct pci_dev *dev)
 		return;
 
 	bridge = dev->bus->self;
-	if (!bridge || !pci_is_pcie(bridge))
+	if (!bridge)
 		return;
 
 	pos = pci_pcie_cap(bridge);
@@ -2054,9 +2054,6 @@ void pci_disable_ido(struct pci_dev *dev, unsigned long type)
 	int pos;
 	u16 ctrl;
 
-	if (!pci_is_pcie(dev))
-		return;
-
 	pos = pci_pcie_cap(dev);
 	if (!pos)
 		return;
@@ -2096,9 +2093,6 @@ int pci_enable_obff(struct pci_dev *dev, enum pci_obff_signal_type type)
 	u16 ctrl;
 	int ret;
 
-	if (!pci_is_pcie(dev))
-		return -ENOTSUPP;
-
 	pos = pci_pcie_cap(dev);
 	if (!pos)
 		return -ENOTSUPP;
@@ -2149,9 +2143,6 @@ void pci_disable_obff(struct pci_dev *dev)
 	int pos;
 	u16 ctrl;
 
-	if (!pci_is_pcie(dev))
-		return;
-
 	pos = pci_pcie_cap(dev);
 	if (!pos)
 		return;
@@ -2174,9 +2165,6 @@ static bool pci_ltr_supported(struct pci_dev *dev)
 	int pos;
 	u32 cap;
 
-	if (!pci_is_pcie(dev))
-		return false;
-
 	pos = pci_pcie_cap(dev);
 	if (!pos)
 		return false;