diff mbox

[v2,08/11] PCI Hotplug: acpiphp: convert to acpi_get_pci_dev

Message ID 20090604055857.18802.34388.stgit@bob.kio (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Alexander Chiang June 4, 2009, 5:58 a.m. UTC 
Now that acpi_get_pci_dev is available, let's use it instead of
acpi_get_pci_id.

Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Alex Chiang <achiang@hp.com>
---

 drivers/pci/hotplug/acpiphp_glue.c |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Jesse Barnes June 11, 2009, 9:48 p.m. UTC | #1 
On Wed, 03 Jun 2009 23:58:57 -0600
Alex Chiang <achiang@hp.com> wrote:

> Now that acpi_get_pci_dev is available, let's use it instead of
> acpi_get_pci_id.
> 
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Alex Chiang <achiang@hp.com>
> ---
> 

Applied to linux-next, thanks.
Jesse Barnes June 11, 2009, 10:17 p.m. UTC | #2 
On Thu, 11 Jun 2009 14:48:45 -0700
Jesse Barnes <jesse.barnes@intel.com> wrote:

> On Wed, 03 Jun 2009 23:58:57 -0600
> Alex Chiang <achiang@hp.com> wrote:
> 
> > Now that acpi_get_pci_dev is available, let's use it instead of
> > acpi_get_pci_id.
> > 
> > Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> > Signed-off-by: Alex Chiang <achiang@hp.com>
> > ---
> > 
> 
> Applied to linux-next, thanks.

Oops, since this one depends on others in the series it's probably best
if they just go in through Len's tree.  This one has my 
  Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
too.
diff mbox

Patch

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index fc6636e..0cb0f83 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -678,18 +678,9 @@  static void remove_bridge(acpi_handle handle)
 
 static struct pci_dev * get_apic_pci_info(acpi_handle handle)
 {
-	struct acpi_pci_id id;
-	struct pci_bus *bus;
 	struct pci_dev *dev;
 
-	if (ACPI_FAILURE(acpi_get_pci_id(handle, &id)))
-		return NULL;
-
-	bus = pci_find_bus(id.segment, id.bus);
-	if (!bus)
-		return NULL;
-
-	dev = pci_get_slot(bus, PCI_DEVFN(id.device, id.function));
+	dev = acpi_get_pci_dev(handle);
 	if (!dev)
 		return NULL;
 
@@ -1396,19 +1387,16 @@  static void acpiphp_sanitize_bus(struct pci_bus *bus)
 /* Program resources in newly inserted bridge */
 static int acpiphp_configure_bridge (acpi_handle handle)
 {
-	struct acpi_pci_id pci_id;
+	struct pci_dev *dev;
 	struct pci_bus *bus;
 
-	if (ACPI_FAILURE(acpi_get_pci_id(handle, &pci_id))) {
+	dev = acpi_get_pci_dev(handle);
+	if (!dev) {
 		err("cannot get PCI domain and bus number for bridge\n");
 		return -EINVAL;
 	}
-	bus = pci_find_bus(pci_id.segment, pci_id.bus);
-	if (!bus) {
-		err("cannot find bus %d:%d\n",
-				pci_id.segment, pci_id.bus);
-		return -EINVAL;
-	}
+
+	bus = dev->bus;
 
 	pci_bus_size_bridges(bus);
 	pci_bus_assign_resources(bus);
@@ -1416,6 +1404,7 @@  static int acpiphp_configure_bridge (acpi_handle handle)
 	acpiphp_set_hpp_values(handle, bus);
 	pci_enable_bridges(bus);
 	acpiphp_configure_ioapics(handle);
+	pci_dev_put(dev);
 	return 0;
 }