[PATCHv6 5/5] pci: Quick return for pci_device_is_present

From: Keith Busch <keith.busch@intel.com>
To: linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Lukas Wunner <lukas@wunner.de>, Wei Zhang <wzhang@fb.com>,
	Austin Bolen <Austin.Bolen@dell.com>,
	Christoph Hellwig <hch@infradead.org>,
	Keith Busch <keith.busch@intel.com>
Subject: [PATCHv6 5/5] pci: Quick return for pci_device_is_present
Date: Tue,  7 Feb 2017 14:32:37 -0500	[thread overview]
Message-ID: <1486495957-26177-6-git-send-email-keith.busch@intel.com> (raw)
In-Reply-To: <1486495957-26177-1-git-send-email-keith.busch@intel.com>

If the pci device is disconnected, return false immediately for checking
presence. We can't use the early return in pci device config accessors
since this function uses the bus accessors.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
 drivers/pci/pci.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index a881c0d..b8d37e7 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4932,6 +4932,8 @@ bool pci_device_is_present(struct pci_dev *pdev)
 {
 	u32 v;
 
+	if (pci_dev_is_disconnected(pdev))
+		return false;
 	return pci_bus_read_dev_vendor_id(pdev->bus, pdev->devfn, &v, 0);
 }
 EXPORT_SYMBOL_GPL(pci_device_is_present);
-- 
2.7.2
