1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 19:19:52 +02:00
openwrt-xburst/target/linux/s3c24xx/patches-2.6.24/1106-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch
mirko fc54b9bf15 changed Makefile and profiles, added patches for kernel 2.6.24
(stable-branch of Openmoko)


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13613 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-12-12 11:58:53 +00:00

64 lines
2.3 KiB
Diff

From d5964d963a8b486d3b78fd4a135ee400bbf93bd1 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@openmoko.org>
Date: Sun, 13 Apr 2008 07:25:52 +0100
Subject: [PATCH] Simplify the code, there is no need for a branch. The code for
GTA01_GPIO_AUX_KEY looks odd.
Signed-Off-by: Holger Freyther <zecke@openmoko.org>
---
drivers/input/keyboard/neo1973kbd.c | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
index 917d5ae..99ca9c3 100644
--- a/drivers/input/keyboard/neo1973kbd.c
+++ b/drivers/input/keyboard/neo1973kbd.c
@@ -37,11 +37,8 @@ static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
struct neo1973kbd *neo1973kbd_data = dev_id;
/* FIXME: use GPIO from platform_dev resources */
- if (s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY))
- input_report_key(neo1973kbd_data->input, KEY_PHONE, 0);
- else
- input_report_key(neo1973kbd_data->input, KEY_PHONE, 1);
-
+ int key_pressed = !s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY);
+ input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
input_sync(neo1973kbd_data->input);
return IRQ_HANDLED;
@@ -52,11 +49,8 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
struct neo1973kbd *neo1973kbd_data = dev_id;
/* FIXME: use GPIO from platform_dev resources */
- if (s3c2410_gpio_getpin(GTA01_GPIO_HOLD_KEY))
- input_report_key(neo1973kbd_data->input, KEY_PAUSE, 1);
- else
- input_report_key(neo1973kbd_data->input, KEY_PAUSE, 0);
-
+ int key_pressed = 3c2410_gpio_getpin(GTA01_GPIO_HOLD_KEY);
+ input_report_key(neo1973kbd_data->input, KEY_PAUSE, key_pressed);
input_sync(neo1973kbd_data->input);
return IRQ_HANDLED;
@@ -67,13 +61,9 @@ static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
struct neo1973kbd *neo1973kbd_data = dev_id;
/* FIXME: use GPIO from platform_dev resources */
- if (s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT))
- input_report_switch(neo1973kbd_data->input,
- SW_HEADPHONE_INSERT, 1);
- else
- input_report_switch(neo1973kbd_data->input,
- SW_HEADPHONE_INSERT, 0);
-
+ int key_pressed = s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT);
+ input_report_switch(neo1973kbd_data->input,
+ SW_HEADPHONE_INSERT, key_pressed);
input_sync(neo1973kbd_data->input);
return IRQ_HANDLED;
--
1.5.6.5