From patchwork Fri Jul 30 22:24:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 116140 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6UMebrk011152 for ; Fri, 30 Jul 2010 22:40:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756735Ab0G3Wkk (ORCPT ); Fri, 30 Jul 2010 18:40:40 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:49423 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755583Ab0G3Wke (ORCPT ); Fri, 30 Jul 2010 18:40:34 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id C41BD18D0C8; Sat, 31 Jul 2010 00:34:56 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 30354-04; Sat, 31 Jul 2010 00:34:36 +0200 (CEST) Received: from ferrari.localnet (unknown [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 7BD0918CFEE; Sat, 31 Jul 2010 00:34:36 +0200 (CEST) From: "Rafael J. Wysocki" To: Jesse Barnes Subject: [PATCH 1/7] ACPI / PCI: Make acpi_pci_run_osc() use capbuf to return the result Date: Sat, 31 Jul 2010 00:24:09 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.35-rc6-rjw+; KDE/4.4.4; x86_64; ; ) Cc: Kenji Kaneshige , Hidetoshi Seto , Matthew Garrett , linux-pci@vger.kernel.org, linux-pm@lists.linux-foundation.org, ACPI Devel Maling List , Len Brown References: <201007310020.56546.rjw@sisk.pl> In-Reply-To: <201007310020.56546.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201007310024.10174.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 30 Jul 2010 22:40:41 +0000 (UTC) Index: linux-2.6/drivers/acpi/pci_root.c =================================================================== --- linux-2.6.orig/drivers/acpi/pci_root.c +++ linux-2.6/drivers/acpi/pci_root.c @@ -206,8 +206,7 @@ static void acpi_pci_bridge_scan(struct static u8 pci_osc_uuid_str[] = "33DB4D5B-1FF7-401C-9657-7441C03DD766"; -static acpi_status acpi_pci_run_osc(acpi_handle handle, - const u32 *capbuf, u32 *retval) +static acpi_status acpi_pci_run_osc(acpi_handle handle, u32 *capbuf) { struct acpi_osc_context context = { .uuid_str = pci_osc_uuid_str, @@ -219,7 +218,7 @@ static acpi_status acpi_pci_run_osc(acpi status = acpi_run_osc(handle, &context); if (ACPI_SUCCESS(status)) { - *retval = *((u32 *)(context.ret.pointer + 8)); + capbuf[OSC_CONTROL_TYPE] = ((u32 *)context.ret.pointer)[2]; kfree(context.ret.pointer); } return status; @@ -228,7 +227,7 @@ static acpi_status acpi_pci_run_osc(acpi static acpi_status acpi_pci_query_osc(struct acpi_pci_root *root, u32 flags) { acpi_status status; - u32 support_set, result, capbuf[3]; + u32 support_set, capbuf[3]; /* do _OSC query for all possible controls */ support_set = root->osc_support_set | (flags & OSC_PCI_SUPPORT_MASKS); @@ -236,10 +235,10 @@ static acpi_status acpi_pci_query_osc(st capbuf[OSC_SUPPORT_TYPE] = support_set; capbuf[OSC_CONTROL_TYPE] = OSC_PCI_CONTROL_MASKS; - status = acpi_pci_run_osc(root->device->handle, capbuf, &result); + status = acpi_pci_run_osc(root->device->handle, capbuf); if (ACPI_SUCCESS(status)) { root->osc_support_set = support_set; - root->osc_control_qry = result; + root->osc_control_qry = capbuf[OSC_CONTROL_TYPE]; root->osc_queried = 1; } return status; @@ -373,7 +372,7 @@ EXPORT_SYMBOL_GPL(acpi_get_pci_dev); acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags) { acpi_status status; - u32 control_req, result, capbuf[3]; + u32 control_req, capbuf[3]; acpi_handle tmp; struct acpi_pci_root *root; @@ -410,9 +409,9 @@ acpi_status acpi_pci_osc_control_set(acp capbuf[OSC_QUERY_TYPE] = 0; capbuf[OSC_SUPPORT_TYPE] = root->osc_support_set; capbuf[OSC_CONTROL_TYPE] = root->osc_control_set | control_req; - status = acpi_pci_run_osc(handle, capbuf, &result); + status = acpi_pci_run_osc(handle, capbuf); if (ACPI_SUCCESS(status)) - root->osc_control_set = result; + root->osc_control_set = capbuf[OSC_CONTROL_TYPE]; out: mutex_unlock(&osc_lock); return status;