From patchwork Fri Sep 6 17:13:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 273285 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 986DE2C007E for ; Sat, 7 Sep 2013 03:13:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753554Ab3IFRNv (ORCPT ); Fri, 6 Sep 2013 13:13:51 -0400 Received: from mail-yh0-f42.google.com ([209.85.213.42]:60841 "EHLO mail-yh0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753050Ab3IFRNv (ORCPT ); Fri, 6 Sep 2013 13:13:51 -0400 Received: by mail-yh0-f42.google.com with SMTP id z12so1318464yhz.15 for ; Fri, 06 Sep 2013 10:13:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=HJiTn3rXQbDGLf6frv+/V1z8McyP0rRZwIMP+oJBY0I=; b=BY+7oT3gLl+mdVN43VHLqGl5wFcuB51d+GOcGvKhYBrVbt9VF1Nqdd06Ld2KmrxRZz eFKcJemW/k+V6hUL1jl1xAu5E+DdGKA74garFzty2fhJmYujK+sLfUA59n0VjJIHlzxM 89vRsydD4xbfQFRRBhuqh9aGQV2L0GYtt3THQDPqNE/o1cm/mqUJRugPkRLyiYdqbErF RXB4FooccsSAganvaC7rimLcrvO/Vk3NNwwEnFOdIoYl0BugLu4xz20GVAjuKRO2puJ7 ZLDyjP3THqlniB+Y5uFL1ZFjy33Zyo/w2JGSMTFnL8/wenkvH4wIIX4UJRYj3jqsUBXo tfQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=HJiTn3rXQbDGLf6frv+/V1z8McyP0rRZwIMP+oJBY0I=; b=CFtvekJJQqOGCv9oJuIs0noTc2RT0UpfkMytmEyEphqefiKgHQcL+DWvfbeLgc6x1y yYwA62l6dArLf6FFW3ffueNs9RvOIMcAqh8+hPGY13prO01lFQKFq9NYH7u8R2LRBDf0 3d6prcJeuW31IQUkoyvgUV11lcbfIkVvHRizfHjOzsTlYGi2ySexXshE5eyWAhWz2rvM +CtX/6FcqhbyRhnm8LXhgYZcvEmje4BYIws4Q77mQzmnO8gZGH2DI1PMMJSfy8pBOn5K 36mF6Fs9D3i6jfHlEFA15v9tT04QXvHSJmgHcHh5SyILNbtyn6p8jgy4Agnd1ek2RMs6 jIpw== X-Gm-Message-State: ALoCoQlz0q0AkkTL7SRFTxm9o2b2iLEjwqVBJvST1wtuiXusffDRAB9zmCoyz++0cSipBTfNcG7oCeQmACEruOCT0m5akMQhKYj6NxB3KshiuqOxHGItepsLEmUzBFX7F0wkR1bCzpafN3MVJGKfhtPf/kpA0i+DShz5tDsgAK9rz174axawG+Z18qbiVl1uTJ5LGCsTRQqO4RnxiZvjjputbbyImDYmGya8gFGXCl+jUwUVDXax/rw= X-Received: by 10.236.163.228 with SMTP id a64mr3126469yhl.35.1378487630260; Fri, 06 Sep 2013 10:13:50 -0700 (PDT) Received: from localhost ([172.16.53.165]) by mx.google.com with ESMTPSA id u52sm4089351yhg.5.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 06 Sep 2013 10:13:49 -0700 (PDT) Subject: [PATCH 03/14] ACPI: Tidy acpi_run_osc() declarations To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, Len Brown Date: Fri, 06 Sep 2013 11:13:47 -0600 Message-ID: <20130906171347.11482.54142.stgit@bhelgaas-glaptop> In-Reply-To: <20130906171010.11482.34235.stgit@bhelgaas-glaptop> References: <20130906171010.11482.34235.stgit@bhelgaas-glaptop> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Move the acpi_run_osc() prototype next to the related structure and update comments. No functional change. Signed-off-by: Bjorn Helgaas --- include/linux/acpi.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 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/include/linux/acpi.h b/include/linux/acpi.h index 3ba9fe3..902cccf 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -294,12 +294,14 @@ void __init acpi_nvs_nosave_s3(void); #endif /* CONFIG_PM_SLEEP */ struct acpi_osc_context { - char *uuid_str; /* uuid string */ + char *uuid_str; /* UUID string */ int rev; - struct acpi_buffer cap; /* arg2/arg3 */ - struct acpi_buffer ret; /* free by caller if success */ + struct acpi_buffer cap; /* list of DWORD capabilities */ + struct acpi_buffer ret; /* free by caller if success */ }; +acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); + /* Indexes into _OSC Capabilities Buffer (DWORDs 2 & 3 are device-specific) */ #define OSC_QUERY_DWORD 0 /* DWORD 1 */ #define OSC_SUPPORT_DWORD 1 /* DWORD 2 */ @@ -312,8 +314,6 @@ struct acpi_osc_context { #define OSC_INVALID_REVISION_ERROR 0x00000008 /* return */ #define OSC_CAPABILITIES_MASK_ERROR 0x00000010 /* return */ -acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context); - /* Platform-Wide Capabilities _OSC: Capabilities DWORD 2: Support Field */ #define OSC_SB_PAD_SUPPORT 0x00000001 #define OSC_SB_PPC_OST_SUPPORT 0x00000002