Title: [3973] trunk/drivers/input/keyboard: changes in opencores-kbd.
c per Mike Frysinger advice, and previously omitted Makefile commit
- Revision
- 3973
- Author
- ea1crb
- Date
- 2007-12-03 08:30:10 -0600 (Mon, 03 Dec 2007)
Log Message
changes in opencores-kbd.c per Mike Frysinger advice, and previously omitted Makefile commit
Diffstat
Makefile | 2 ++
opencores-kbd.c | 15 ++++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
Modified Paths
Diff
Modified: trunk/drivers/input/keyboard/Makefile (3972 => 3973)
--- trunk/drivers/input/keyboard/Makefile 2007-12-03 09:14:04 UTC (rev 3972)
+++ trunk/drivers/input/keyboard/Makefile 2007-12-03 14:30:10 UTC (rev 3973)
@@ -22,3 +22,5 @@
obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o
obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o
obj-$(CONFIG_KEYBOARD_BFIN) += bf54x-keys.o
+obj-$(CONFIG_KEYBOARD_OPENCORES) += opencores-kbd.o
+
Modified: trunk/drivers/input/keyboard/opencores-kbd.c (3972 => 3973)
--- trunk/drivers/input/keyboard/opencores-kbd.c 2007-12-03 09:14:04 UTC (rev 3972)
+++ trunk/drivers/input/keyboard/opencores-kbd.c 2007-12-03 14:30:10 UTC (rev 3973)
@@ -46,6 +46,7 @@
#include <linux/irq.h>
#define DRV_NAME "opencores-kbd"
+#define NUM_KEYS 128
struct opencores_kbd {
struct input_dev *input;
@@ -74,18 +75,16 @@
struct opencores_kbd *opencores_kbd;
int i, error;
- opencores_kbd = kzalloc(sizeof(struct opencores_kbd), GFP_KERNEL);
+ opencores_kbd = kzalloc(sizeof(*opencores_kbd), GFP_KERNEL);
if (!opencores_kbd)
return -ENOMEM;
- opencores_kbd->keycode = kmalloc(128 * sizeof(unsigned short), GFP_KERNEL);
+ opencores_kbd->keycode = kmalloc(NUM_KEYS * sizeof(unsigned short), GFP_KERNEL);
if (!opencores_kbd->keycode) {
error = -ENOMEM;
goto out;
}
- for (i = 0; i < 128; i++) opencores_kbd->keycode[i] = i;
-
platform_set_drvdata(pdev, opencores_kbd);
opencores_kbd->addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -122,14 +121,16 @@
input->id.product = 0x0001;
input->id.version = 0x0100;
- input->keycodesize = sizeof(opencores_kbd->keycode);
- input->keycodemax = 128;
+ input->keycodesize = sizeof(*opencores_kbd->keycode);
+ input->keycodemax = NUM_KEYS;
input->keycode = opencores_kbd->keycode;
__set_bit(EV_KEY, input->evbit);
- for (i = 0; i < input->keycodemax; i++)
+ for (i = 0; i < input->keycodemax; i++) {
+ opencores_kbd->keycode[i] = i;
__set_bit(opencores_kbd->keycode[i] & KEY_MAX, input->keybit);
+ }
__clear_bit(KEY_RESERVED, input->keybit);
error = input_register_device(opencores_kbd->input);
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
