Re: [PATCH 57/98] sony-laptop: Add support for extra keyboard events

Matthias Welwarsky
2009-03-29T17:56:54Z

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 :)

--- 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,