From patchwork Sun Mar 1 04:40:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattia Dongili X-Patchwork-Id: 9415 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 n214otWM004498 for ; Sun, 1 Mar 2009 04:50:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751491AbZCAEuX (ORCPT ); Sat, 28 Feb 2009 23:50:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751637AbZCAEuW (ORCPT ); Sat, 28 Feb 2009 23:50:22 -0500 Received: from static-220-247-10-204.b-man.svips.gol.ne.jp ([220.247.10.204]:48644 "EHLO smtp.kamineko.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751491AbZCAEuR (ORCPT ); Sat, 28 Feb 2009 23:50:17 -0500 X-Greylist: delayed 569 seconds by postgrey-1.27 at vger.kernel.org; Sat, 28 Feb 2009 23:50:17 EST Received: from tadamune.kamineko.org (unknown [192.168.1.21]) by smtp.kamineko.org (Postfix) with ESMTP id 05341459E8; Sun, 1 Mar 2009 13:40:46 +0900 (JST) Received: by tadamune.kamineko.org (Postfix, from userid 1000) id 3419E1313C; Sun, 1 Mar 2009 13:40:45 +0900 (JST) From: Mattia Dongili To: Len Brown Cc: linux-acpi@vger.kernel.org, Mattia Dongili Subject: [PATCH 8/9] [sony-laptop] Rename the SNC callback and events Date: Sun, 1 Mar 2009 13:40:44 +0900 Message-Id: <1235882445-2404-9-git-send-email-malattia@linux.it> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1235882445-2404-1-git-send-email-malattia@linux.it> References: <1235882445-2404-1-git-send-email-malattia@linux.it> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org This two objects are not specific to the C series. Signed-off-by: Mattia Dongili --- drivers/platform/x86/sony-laptop.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 576c9c2..021c9d2 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -816,10 +816,10 @@ struct sony_nc_event { static struct sony_nc_event *sony_nc_events; -/* Vaio C* --maybe also FE*, N* and AR* ?-- special init sequence - * for Fn keys +/* Some Vaio models require additional steps to enable + * Fn keys */ -static int sony_nc_C_enable(const struct dmi_system_id *id) +static int sony_SNC_enable_cb(const struct dmi_system_id *id) { int result = 0; @@ -840,7 +840,7 @@ static int sony_nc_C_enable(const struct dmi_system_id *id) return 0; } -static struct sony_nc_event sony_C_events[] = { +static struct sony_nc_event sony_SNC_events[] = { { 0x81, SONYPI_EVENT_FNKEY_F1 }, { 0x01, SONYPI_EVENT_FNKEY_RELEASED }, { 0x82, SONYPI_EVENT_FNKEY_F2 }, @@ -869,8 +869,8 @@ static struct sony_nc_event sony_C_events[] = { static const struct dmi_system_id sony_nc_ids[] = { { .ident = "Sony Vaio FE Series", - .callback = sony_nc_C_enable, - .driver_data = sony_C_events, + .callback = sony_SNC_enable_cb, + .driver_data = sony_SNC_events, .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FE"), @@ -878,8 +878,8 @@ static const struct dmi_system_id sony_nc_ids[] = { }, { .ident = "Sony Vaio FW Series", - .callback = sony_nc_C_enable, - .driver_data = sony_C_events, + .callback = sony_SNC_enable_cb, + .driver_data = sony_SNC_events, .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW"), @@ -887,8 +887,8 @@ static const struct dmi_system_id sony_nc_ids[] = { }, { .ident = "Sony Vaio FZ Series", - .callback = sony_nc_C_enable, - .driver_data = sony_C_events, + .callback = sony_SNC_enable_cb, + .driver_data = sony_SNC_events, .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ"), @@ -896,8 +896,8 @@ static const struct dmi_system_id sony_nc_ids[] = { }, { .ident = "Sony Vaio C Series", - .callback = sony_nc_C_enable, - .driver_data = sony_C_events, + .callback = sony_SNC_enable_cb, + .driver_data = sony_SNC_events, .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "VGN-C"), @@ -905,8 +905,8 @@ static const struct dmi_system_id sony_nc_ids[] = { }, { .ident = "Sony Vaio N Series", - .callback = sony_nc_C_enable, - .driver_data = sony_C_events, + .callback = sony_SNC_enable_cb, + .driver_data = sony_SNC_events, .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "VGN-N"), @@ -914,8 +914,8 @@ static const struct dmi_system_id sony_nc_ids[] = { }, { .ident = "Sony Vaio Z Series", - .callback = sony_nc_C_enable, - .driver_data = sony_C_events, + .callback = sony_SNC_enable_cb, + .driver_data = sony_SNC_events, .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "VGN-Z"),