From patchwork Sun Feb 15 18:30:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 7357 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 n1FIf8V6021542 for ; Sun, 15 Feb 2009 18:41:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754287AbZBOSlO (ORCPT ); Sun, 15 Feb 2009 13:41:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754508AbZBOSlO (ORCPT ); Sun, 15 Feb 2009 13:41:14 -0500 Received: from smtp21.services.sfr.fr ([93.17.128.1]:62695 "EHLO smtp21.services.sfr.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754287AbZBOSlN (ORCPT ); Sun, 15 Feb 2009 13:41:13 -0500 Received: from smtp21.services.sfr.fr (msfrf2119 [10.18.25.33]) by msfrf2120.sfr.fr (SMTP Server) with ESMTP id 54D477000637 for ; Sun, 15 Feb 2009 19:33:23 +0100 (CET) Received: from filter.sfr.fr (localhost [127.0.0.1]) by msfrf2119.sfr.fr (SMTP Server) with ESMTP id 83A4A70000AF; Sun, 15 Feb 2009 19:30:21 +0100 (CET) Received: from localhost.localdomain (222.98.192-77.rev.gaoland.net [77.192.98.222]) by msfrf2119.sfr.fr (SMTP Server) with ESMTP id 412BC70000B0; Sun, 15 Feb 2009 19:30:21 +0100 (CET) X-SFR-UUID: 20090215183021267.412BC70000B0@msfrf2119.sfr.fr From: Corentin Chary To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, mjg59@srcf.ucam.org, Corentin Chary Subject: [PATCH 2/4] asus-laptop: restore acpi_generate_proc_event() Date: Sun, 15 Feb 2009 19:30:19 +0100 Message-Id: <1234722621-14498-3-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.6.1.3 In-Reply-To: <1234722621-14498-2-git-send-email-corentincj@iksaif.net> References: <1234722621-14498-1-git-send-email-corentincj@iksaif.net> <1234722621-14498-2-git-send-email-corentincj@iksaif.net> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Restore acpi_generate_proc_event() for backward compatibility with old acpi scripts. Signed-off-by: Corentin Chary --- drivers/platform/x86/asus-laptop.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 56af6cf..eeafc6c 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c @@ -815,6 +815,7 @@ static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode) static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) { static struct key_entry *key; + u16 count; /* TODO Find a better way to handle events count. */ if (!hotk) @@ -832,9 +833,11 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) lcd_blank(FB_BLANK_POWERDOWN); } + count = hotk->event_count[event % 128]++; + acpi_bus_generate_proc_event(hotk->device, event, count); acpi_bus_generate_netlink_event(hotk->device->pnp.device_class, dev_name(&hotk->device->dev), event, - hotk->event_count[event % 128]++); + count); if (hotk->inputdev) { key = asus_get_entry_by_scancode(event);