From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761246AbZBMUTv (ORCPT ); Fri, 13 Feb 2009 15:19:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760784AbZBMUTF (ORCPT ); Fri, 13 Feb 2009 15:19:05 -0500 Received: from g1t0029.austin.hp.com ([15.216.28.36]:20545 "EHLO g1t0029.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760188AbZBMUTE (ORCPT ); Fri, 13 Feb 2009 15:19:04 -0500 From: Alex Chiang Subject: [RFC PATCH v2 02/12] PCI: pci_scan_slot() returns newly found devices To: jbarnes@virtuousgeek.org Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Trent Piepho , Alex Chiang Date: Fri, 13 Feb 2009 13:19:03 -0700 Message-ID: <20090213201903.19262.63239.stgit@bob.kio> In-Reply-To: <20090213201135.19262.67924.stgit@bob.kio> References: <20090213201135.19262.67924.stgit@bob.kio> User-Agent: StGIT/0.14.3.215.gff3d MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Trent Piepho pci_scan_slot() has been rewritten to be less complex and will now return the number of *new* devices found. Existing callers need not worry because they already assume that they can't call pci_scan_slot() on an already-scanned slot. Thus, there is no semantic change for existing callers: returning newly found devices (this patch) is exactly equal to returning all found devices (before this patch). This patch adds some more groundwork to allow us to rescan the PCI bus during runtime to discover newly added devices. Signed-off-by: Trent Piepho Reviewed-by: Alex Chiang Signed-off-by: Alex Chiang --- drivers/pci/probe.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 66b5d1c..d392813 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1030,35 +1030,26 @@ EXPORT_SYMBOL(pci_scan_single_device); * Scan a PCI slot on the specified PCI bus for devices, adding * discovered devices to the @bus->devices list. New devices * will not have is_added set. + * + * Returns the number of new devices found. */ int pci_scan_slot(struct pci_bus *bus, int devfn) { - int func, nr = 0; - int scan_all_fns; - - scan_all_fns = pcibios_scan_all_fns(bus, devfn); - - for (func = 0; func < 8; func++, devfn++) { - struct pci_dev *dev; + int fn, nr = 0; + struct pci_dev *dev; - dev = pci_scan_single_device(bus, devfn); - if (dev) { + if ((dev = pci_scan_single_device(bus, devfn))) + if (!dev->is_added) /* new device? */ nr++; - /* - * If this is a single function device, - * don't scan past the first function. - */ - if (!dev->multifunction) { - if (func > 0) { - dev->multifunction = 1; - } else { - break; - } + if ((dev && dev->multifunction) || + (!dev && pcibios_scan_all_fns(bus, devfn))) { + for (fn = 1; fn < 8; fn++) { + if ((dev = pci_scan_single_device(bus, devfn + fn))) { + if (!dev->is_added) + nr++; + dev->multifunction = 1; } - } else { - if (func == 0 && !scan_all_fns) - break; } }