diff options
| author | mirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-12-13 01:54:56 +0000 |
|---|---|---|
| committer | mirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-12-13 01:54:56 +0000 |
| commit | a95f9f92e2953d5829a29e95644dc4c4bc93f590 (patch) | |
| tree | 01f2bf78edb2e3bb1466df9bca72e068632d0e74 /target/linux/s3c24xx/patches-2.6.26/1096-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch | |
| parent | 9fa649271dbc9c83417488203aeb1668a0238c54 (diff) | |
change prefix for kernelpatchbase 2.6.26
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13619 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.26/1096-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch')
| -rwxr-xr-x | target/linux/s3c24xx/patches-2.6.26/1096-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.26/1096-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch b/target/linux/s3c24xx/patches-2.6.26/1096-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch new file mode 100755 index 0000000000..e7c05f8029 --- /dev/null +++ b/target/linux/s3c24xx/patches-2.6.26/1096-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch @@ -0,0 +1,63 @@ +From ca5c103515f48dc5d0d910847fb38a652d70a093 Mon Sep 17 00:00:00 2001 +From: Holger Freyther <zecke@openmoko.org> +Date: Fri, 25 Jul 2008 23:06:02 +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.3 + |