Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Input: locomokbd - convert to dynamic input allocation

Browse Source 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2005-11-02 22:49:53 -05:00
parent 7afada45da
commit 438c9da514
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/input/keyboard/locomokbd.c
View File

@ -76,7 +76,7 @@ static unsigned char locomokbd_keycode[LOCOMOKBD_NUMKEYS] = {
struct locomokbd {
unsigned char keycode[LOCOMOKBD_NUMKEYS];
struct input_dev input;
struct input_dev *input;
char phys[32];
struct locomo_dev *ldev;
@ -136,8 +136,7 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *
spin_lock_irqsave(&locomokbd->lock, flags);
if (regs)
input_regs(&locomokbd->input, regs);
input_regs(locomokbd->input, regs);
locomokbd_charge_all(membase);
@ -152,16 +151,16 @@ static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *
scancode = SCANCODE(col, row);
if (rowd & KB_ROWMASK(row)) {
num_pressed += 1;
input_report_key(&locomokbd->input, locomokbd->keycode[scancode], 1);
input_report_key(locomokbd->input, locomokbd->keycode[scancode], 1);
} else {
input_report_key(&locomokbd->input, locomokbd->keycode[scancode], 0);
input_report_key(locomokbd->input, locomokbd->keycode[scancode], 0);
}
}
locomokbd_reset_col(membase, col);
}
locomokbd_activate_all(membase);
input_sync(&locomokbd->input);
input_sync(locomokbd->input);
/* if any keys are pressed, enable the timer */
if (num_pressed)
@ -196,13 +195,15 @@ static void locomokbd_timer_callback(unsigned long data)
static int locomokbd_probe(struct locomo_dev *dev)
{
struct locomokbd *locomokbd;
struct input_dev *input_dev;
int i, ret;
locomokbd = kmalloc(sizeof(struct locomokbd), GFP_KERNEL);
if (!locomokbd)
return -ENOMEM;
memset(locomokbd, 0, sizeof(struct locomokbd));
locomokbd = kzalloc(sizeof(struct locomokbd), GFP_KERNEL);
input_dev = input_allocate_device();
if (!locomokbd || !input_dev) {
ret = -ENOMEM;
goto free;
}
/* try and claim memory region */
if (!request_mem_region((unsigned long) dev->mapbase,
@ -224,27 +225,26 @@ static int locomokbd_probe(struct locomo_dev *dev)
locomokbd->timer.function = locomokbd_timer_callback;
locomokbd->timer.data = (unsigned long) locomokbd;
locomokbd->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
locomokbd->input = input_dev;
strcpy(locomokbd->phys, "locomokbd/input0");
init_input_dev(&locomokbd->input);
locomokbd->input.keycode = locomokbd->keycode;
locomokbd->input.keycodesize = sizeof(unsigned char);
locomokbd->input.keycodemax = ARRAY_SIZE(locomokbd_keycode);
locomokbd->input.private = locomokbd;
input_dev->name = "LoCoMo keyboard";
input_dev->phys = locomokbd->phys;
input_dev->id.bustype = BUS_XTKBD;
input_dev->id.vendor = 0x0001;
input_dev->id.product = 0x0001;
input_dev->id.version = 0x0100;
input_dev->private = locomokbd;
input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
input_dev->keycode = locomokbd->keycode;
input_dev->keycodesize = sizeof(unsigned char);
input_dev->keycodemax = ARRAY_SIZE(locomokbd_keycode);
memcpy(locomokbd->keycode, locomokbd_keycode, sizeof(locomokbd->keycode));
for (i = 0; i < LOCOMOKBD_NUMKEYS; i++)
set_bit(locomokbd->keycode[i], locomokbd->input.keybit);
clear_bit(0, locomokbd->input.keybit);
strcpy(locomokbd->phys, "locomokbd/input0");
locomokbd->input.name = "LoCoMo keyboard";
locomokbd->input.phys = locomokbd->phys;
locomokbd->input.id.bustype = BUS_XTKBD;
locomokbd->input.id.vendor = 0x0001;
locomokbd->input.id.product = 0x0001;
locomokbd->input.id.version = 0x0100;
set_bit(locomokbd->keycode[i], input_dev->keybit);
clear_bit(0, input_dev->keybit);
/* attempt to get the interrupt */
ret = request_irq(dev->irq[0], locomokbd_interrupt, 0, "locomokbd", locomokbd);
@ -253,9 +253,7 @@ static int locomokbd_probe(struct locomo_dev *dev)
goto out;
}
input_register_device(&locomokbd->input);
printk(KERN_INFO "input: LoCoMo keyboard on locomokbd\n");
input_register_device(locomokbd->input);
return 0;
@ -263,6 +261,7 @@ out:
release_mem_region((unsigned long) dev->mapbase, dev->length);
locomo_set_drvdata(dev, NULL);
free:
input_free_device(input_dev);
kfree(locomokbd);
return ret;
@ -276,7 +275,7 @@ static int locomokbd_remove(struct locomo_dev *dev)
del_timer_sync(&locomokbd->timer);
input_unregister_device(&locomokbd->input);
input_unregister_device(locomokbd->input);
locomo_set_drvdata(dev, NULL);
release_mem_region((unsigned long) dev->mapbase, dev->length);