From patchwork Mon Sep 14 22:35:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 47529 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8EMYuNK005846 for ; Mon, 14 Sep 2009 22:35:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757449AbZINWfI (ORCPT ); Mon, 14 Sep 2009 18:35:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757457AbZINWfI (ORCPT ); Mon, 14 Sep 2009 18:35:08 -0400 Received: from g1t0027.austin.hp.com ([15.216.28.34]:38984 "EHLO g1t0027.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757449AbZINWfG (ORCPT ); Mon, 14 Sep 2009 18:35:06 -0400 Received: from g5t0030.atlanta.hp.com (g5t0030.atlanta.hp.com [16.228.8.142]) by g1t0027.austin.hp.com (Postfix) with ESMTP id 936423858D; Mon, 14 Sep 2009 22:35:09 +0000 (UTC) Received: from ldl (linux.corp.hp.com [15.11.146.101]) by g5t0030.atlanta.hp.com (Postfix) with ESMTP id 4768E24390; Mon, 14 Sep 2009 22:35:09 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id 1B47FCF0012; Mon, 14 Sep 2009 16:35:09 -0600 (MDT) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nMd8+FoeOB9E; Mon, 14 Sep 2009 16:35:09 -0600 (MDT) Received: from eh.fc.hp.com (eh.fc.hp.com [15.11.146.105]) by ldl (Postfix) with ESMTP id 02C9ACF0010; Mon, 14 Sep 2009 16:35:09 -0600 (MDT) Received: from bob.kio (localhost [127.0.0.1]) by eh.fc.hp.com (Postfix) with ESMTP id 650CD26157; Mon, 14 Sep 2009 16:35:15 -0600 (MDT) Subject: [PATCH v4 3/8] PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface To: Jesse Barnes From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, Rolf Eike Beer , Gary Hade , Kristen Carlson Accardi , Kenji Kaneshige Date: Mon, 14 Sep 2009 16:35:15 -0600 Message-ID: <20090914223515.29102.85539.stgit@bob.kio> In-Reply-To: <20090914223304.29102.85232.stgit@bob.kio> References: <20090914223304.29102.85232.stgit@bob.kio> User-Agent: StGit/0.14.3.386.gb02d MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This patch makes acpi_get_hp_params_from_firmware() take a pci_dev rather than a pci_bus and makes it return a standard int errno rather than acpi_status. Signed-off-by: Bjorn Helgaas Reviewed-by: Kenji Kaneshige Acked-by: Kenji Kaneshige --- drivers/pci/hotplug/acpi_pcihp.c | 14 +++++++------- drivers/pci/hotplug/acpiphp_glue.c | 7 +++---- drivers/pci/hotplug/pciehp.h | 4 +--- drivers/pci/hotplug/shpchp.h | 4 +--- include/linux/pci_hotplug.h | 2 +- 5 files changed, 13 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 diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c index ec3c039..14d2d8a 100644 --- a/drivers/pci/hotplug/acpi_pcihp.c +++ b/drivers/pci/hotplug/acpi_pcihp.c @@ -324,18 +324,18 @@ static acpi_status acpi_run_oshp(acpi_handle handle) /* acpi_get_hp_params_from_firmware * - * @bus - the pci_bus of the bus on which the device is newly added + * @dev - the pci_dev for which we want parameters * @hpp - allocated by the caller */ -acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus, +int acpi_get_hp_params_from_firmware(struct pci_dev *dev, struct hotplug_params *hpp) { - acpi_status status = AE_NOT_FOUND; + acpi_status status; acpi_handle handle, phandle; struct pci_bus *pbus; handle = NULL; - for (pbus = bus; pbus; pbus = pbus->parent) { + for (pbus = dev->bus; pbus; pbus = pbus->parent) { handle = acpi_pci_get_bridge_handle(pbus); if (handle) break; @@ -350,10 +350,10 @@ acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus, while (handle) { status = acpi_run_hpx(handle, hpp); if (ACPI_SUCCESS(status)) - break; + return 0; status = acpi_run_hpp(handle, hpp); if (ACPI_SUCCESS(status)) - break; + return 0; if (acpi_is_root_bridge(handle)) break; status = acpi_get_parent(handle, &phandle); @@ -361,7 +361,7 @@ acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus, break; handle = phandle; } - return status; + return -ENODEV; } EXPORT_SYMBOL_GPL(acpi_get_hp_params_from_firmware); diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index db81c08..14e6f1a 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c @@ -275,11 +275,10 @@ static int detect_ejectable_slots(acpi_handle handle) /* decode ACPI 2.0 _HPP hot plug parameters */ static void decode_hpp(struct pci_dev *dev, struct hotplug_params *hpp) { - acpi_status status; + int ret; - status = acpi_get_hp_params_from_firmware(dev->bus, hpp); - if (ACPI_FAILURE(status) || - !hpp->t0 || (hpp->t0->revision > 1)) { + ret = acpi_get_hp_params_from_firmware(dev, hpp); + if (ret || !hpp->t0 || (hpp->t0->revision > 1)) { /* use default numbers */ printk(KERN_WARNING "%s: Could not get hotplug parameters. Use defaults\n", diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index e6cf096..86cdfd7 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -241,9 +241,7 @@ static inline int pciehp_get_hp_hw_control_from_firmware(struct pci_dev *dev) static inline int pciehp_get_hp_params_from_firmware(struct pci_dev *dev, struct hotplug_params *hpp) { - if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev->bus, hpp))) - return -ENODEV; - return 0; + return acpi_get_hp_params_from_firmware(dev, hpp); } #else #define pciehp_firmware_init() do {} while (0) diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h index 974e924..ad6a255 100644 --- a/drivers/pci/hotplug/shpchp.h +++ b/drivers/pci/hotplug/shpchp.h @@ -191,9 +191,7 @@ static inline const char *slot_name(struct slot *slot) static inline int get_hp_params_from_firmware(struct pci_dev *dev, struct hotplug_params *hpp) { - if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev->bus, hpp))) - return -ENODEV; - return 0; + return acpi_get_hp_params_from_firmware(dev, hpp); } static inline int get_hp_hw_control_from_firmware(struct pci_dev *dev) diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h index f0c31ae..0a7c240 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h @@ -227,7 +227,7 @@ struct hotplug_params { #ifdef CONFIG_ACPI #include #include -extern acpi_status acpi_get_hp_params_from_firmware(struct pci_bus *bus, +int acpi_get_hp_params_from_firmware(struct pci_dev *dev, struct hotplug_params *hpp); int acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev, u32 flags); int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle);