From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [patch 09/17] drivers/input/keyboard/atkbd.c: use function for generation of keyrelease events Date: Fri, 09 Jan 2009 12:19:48 -0800 Message-ID: <200901092019.n09KJmft017193@imap1.linux-foundation.org> Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:43888 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751031AbZAIUco (ORCPT ); Fri, 9 Jan 2009 15:32:44 -0500 Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: dtor@mail.ru Cc: linux-input@vger.kernel.org, akpm@linux-foundation.org, impulze@impulze.org From: Daniel Mierswa Cc: Dmitry Torokhov Signed-off-by: Andrew Morton --- drivers/input/keyboard/atkbd.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff -puN drivers/input/keyboard/atkbd.c~drivers-input-keyboard-atkbdc-use-function-for-generation-of-keyrelease-events drivers/input/keyboard/atkbd.c --- a/drivers/input/keyboard/atkbd.c~drivers-input-keyboard-atkbdc-use-function-for-generation-of-keyrelease-events +++ a/drivers/input/keyboard/atkbd.c @@ -834,6 +834,19 @@ static void atkbd_disconnect(struct seri } /* + * generate release events for the keycodes given in keys[] + */ +static void atkbd_gen_release_event(struct atkbd* atkbd, const unsigned int *keys, + unsigned int nr_keys) +{ + unsigned int i; + + if (atkbd->set == 2) + for (i = 0; i < nr_keys; i++) + __set_bit(keys[i], atkbd->force_release_mask); +} + +/* * Most special keys (Fn+F?) on Dell laptops do not generate release * events so we have to do it ourselves. */ @@ -842,12 +855,9 @@ static void atkbd_dell_laptop_keymap_fix const unsigned int forced_release_keys[] = { 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8f, 0x93, }; - int i; - if (atkbd->set == 2) - for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++) - __set_bit(forced_release_keys[i], - atkbd->force_release_mask); + atkbd_gen_release_event(atkbd, forced_release_keys, + ARRAY_SIZE(forced_release_keys)); } /* @@ -859,12 +869,9 @@ static void atkbd_hp_keymap_fixup(struct const unsigned int forced_release_keys[] = { 0x94, }; - int i; - if (atkbd->set == 2) - for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++) - __set_bit(forced_release_keys[i], - atkbd->force_release_mask); + atkbd_gen_release_event(atkbd, forced_release_keys, + ARRAY_SIZE(forced_release_keys)); } /* _