From patchwork Sun Mar 29 17:56:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Welwarsky X-Patchwork-Id: 15031 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 n2THusMW009827 for ; Sun, 29 Mar 2009 17:56:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753697AbZC2R4z (ORCPT ); Sun, 29 Mar 2009 13:56:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754480AbZC2R4y (ORCPT ); Sun, 29 Mar 2009 13:56:54 -0400 Received: from static.88-198-22-168.clients.your-server.de ([88.198.22.168]:8274 "EHLO basyskom.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753697AbZC2R4y (ORCPT ); Sun, 29 Mar 2009 13:56:54 -0400 Received: by basyskom.de (Postfix, from userid 1051) id 8053628E7D5; Sun, 29 Mar 2009 19:56:51 +0200 (CEST) X-Spam-Flag: NO X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on new.basyskom.de X-Spam-Info: No, score=-1.5 required=6.3 tests=AWL,BAYES_00,RCVD_IN_PBL, RCVD_IN_SORBS_DUL,RDNS_DYNAMIC autolearn=no version=3.2.5 Received: from wind.localnet (p54A7CB79.dip.t-dialin.net [84.167.203.121]) by basyskom.de (Postfix) with ESMTP id D6405280D03; Sun, 29 Mar 2009 19:56:49 +0200 (CEST) From: Matthias Welwarsky To: Matthew Garrett Subject: Re: [PATCH 57/98] sony-laptop: Add support for extra keyboard events Date: Sun, 29 Mar 2009 19:56:48 +0200 Cc: Len Brown , linux-acpi@vger.kernel.org, Mattia Dongili , Len Brown References: <1238214733-8285-1-git-send-email-lenb@kernel.org> <200903291908.36826.matze@welwarsky.de> <20090329171345.GA10131@srcf.ucam.org> In-Reply-To: <20090329171345.GA10131@srcf.ucam.org> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200903291956.48772.matze@welwarsky.de> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Sunday 29 March 2009 19:13:45 Matthew Garrett wrote: > On Sun, Mar 29, 2009 at 07:08:36PM +0200, Matthias Welwarsky wrote: > > + } else > > + sony_laptop_report_input_event(ev); > > } else if (sony_find_snc_handle(0x124) == ev) { > > sony_nc_rfkill_update(); > > return; > > Nitpicky, but with this codeflow I think we can skip the return there? Yes We Can! SCNR :) --- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- sony-laptop.c.orig 2009-03-29 12:41:44.000000000 +0200 +++ sony-laptop.c 2009-03-29 19:53:16.000000000 +0200 @@ -865,7 +865,7 @@ static struct sony_nc_event sony_100_events[] = { { 0x90, SONYPI_EVENT_PKEY_P1 }, { 0x10, SONYPI_EVENT_ANYBUTTON_RELEASED }, - { 0x91, SONYPI_EVENT_PKEY_P1 }, + { 0x91, SONYPI_EVENT_PKEY_P2 }, { 0x11, SONYPI_EVENT_ANYBUTTON_RELEASED }, { 0x81, SONYPI_EVENT_FNKEY_F1 }, { 0x01, SONYPI_EVENT_FNKEY_RELEASED }, @@ -929,7 +929,7 @@ if (sony_find_snc_handle(0x127) == ev) key_handle = 0x127; - if (handle) { + if (key_handle) { struct sony_nc_event *key_event; if (sony_call_snc_handle(key_handle, 0x200, &result)) @@ -955,16 +955,16 @@ printk(KERN_INFO DRV_PFX "Unknown event: 0x%x 0x%x\n", key_handle, ev); - } + } else + sony_laptop_report_input_event(ev); } else if (sony_find_snc_handle(0x124) == ev) { sony_nc_rfkill_update(); - return; } + } else { + dprintk("sony_acpi_notify, event: 0x%.2x\n", ev); + sony_laptop_report_input_event(ev); + acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev); } - - dprintk("sony_acpi_notify, event: 0x%.2x\n", ev); - sony_laptop_report_input_event(ev); - acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev); } static acpi_status sony_walk_callback(acpi_handle handle, u32 level,