From patchwork Thu May 14 13:31:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominik Brodowski X-Patchwork-Id: 6405661 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B6EC3BEEE1 for ; Thu, 14 May 2015 13:34:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DBCF420411 for ; Thu, 14 May 2015 13:34:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F20A0203E9 for ; Thu, 14 May 2015 13:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750781AbbENNeq (ORCPT ); Thu, 14 May 2015 09:34:46 -0400 Received: from isilmar-3.linta.de ([188.40.101.200]:44321 "EHLO linta.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753503AbbENNep (ORCPT ); Thu, 14 May 2015 09:34:45 -0400 Received: (qmail 24958 invoked from network); 14 May 2015 13:33:44 -0000 Received: from isilmar.linta (HELO light.dominikbrodowski.net) (10.0.0.1) by isilmar.linta with (DHE-RSA-AES256-SHA encrypted) SMTP; 14 May 2015 13:33:44 -0000 Received: by light.dominikbrodowski.net (Postfix, from userid 1000) id B048F20126; Thu, 14 May 2015 15:31:34 +0200 (CEST) From: Dominik Brodowski To: rjw@rjwysocki.net Cc: linux-acpi@vger.kernel.org, mario_limonciello@dell.com, broonie@kernel.org, matthew.garrett@coreos.com, alsa-devel@alsa-project.org, Dominik Brodowski Subject: [PATCH 1/4] acpi: use same type for acpi_predefined_names values as in definition Date: Thu, 14 May 2015 15:31:25 +0200 Message-Id: <1431610288-26737-2-git-send-email-linux@dominikbrodowski.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1431610288-26737-1-git-send-email-linux@dominikbrodowski.net> References: <1431610288-26737-1-git-send-email-linux@dominikbrodowski.net> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In the definition of struct acpi_predefined_names, value is of type char *. Make the OSL override function also work with type char * (or, more precisely, with a pointer to it). Signed-off-by: Dominik Brodowski --- drivers/acpi/osl.c | 2 +- include/acpi/acpiosxf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 7ccba39..db14a66 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -540,7 +540,7 @@ static char acpi_os_name[ACPI_MAX_OVERRIDE_LEN]; acpi_status acpi_os_predefined_override(const struct acpi_predefined_names *init_val, - acpi_string * new_val) + char **new_val) { if (!init_val || !new_val) return AE_BAD_PARAMETER; diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 0bc78df..d02df0a 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -95,7 +95,7 @@ acpi_physical_address acpi_os_get_root_pointer(void); #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_predefined_override acpi_status acpi_os_predefined_override(const struct acpi_predefined_names *init_val, - acpi_string * new_val); + char **new_val); #endif #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override