Menu
▾
▴
[Gc-linux-cvs] linux/drivers/input/keyboard Kconfig, 1.8, 1.9 rvl-stkbd.c, 1.2, 1.3
|
From: Albert H. <he...@us...> - 2009-02-01 18:30:04
|
Update of /cvsroot/gc-linux/linux/drivers/input/keyboard In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17186/drivers/input/keyboard Modified Files: Kconfig rvl-stkbd.c Log Message: Merge 2.6.28. Also: - run checkpatch against the non-broken source code - add GPIO driver fixes - implement getgeo for the special block drivers - small fixes Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/Kconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Kconfig 14 Sep 2008 19:20:28 -0000 1.8 +++ Kconfig 1 Feb 2009 18:29:35 -0000 1.9 @@ -321,7 +321,7 @@ Say Y here if you have a Nintendo Wii console running Linux and have a keyboard attached to one of its USB ports. This driver uses the IOS interface glue to access the USB keyboard. - + To compile this driver as a module, choose M here: the module will be called rvl-stkbd. Index: rvl-stkbd.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/keyboard/rvl-stkbd.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rvl-stkbd.c 2 Jul 2008 20:43:10 -0000 1.2 +++ rvl-stkbd.c 1 Feb 2009 18:29:35 -0000 1.3 @@ -2,8 +2,8 @@ * drivers/input/keyboard/rvl-stkbd.c * * Nintendo Wii starlet keyboard driver. - * Copyright (C) 2008 The GameCube Linux Team - * Copyright (C) 2008 Albert Herranz + * Copyright (C) 2008-2009 The GameCube Linux Team + * Copyright (C) 2008,2009 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -37,7 +37,7 @@ static char stkbd_driver_version[] = "0.1i"; #define drv_printk(level, format, arg...) \ - printk(level DRV_MODULE_NAME ": " format , ## arg) + printk(level DRV_MODULE_NAME ": " format , ## arg) /* * Keyboard events from IOS. @@ -64,7 +64,7 @@ */ enum { - __STKBD_RUNNING=1, /* device is opened and running */ + __STKBD_RUNNING = 1, /* device is opened and running */ __STKBD_WAITING_REPORT /* waiting for IOS report */ }; @@ -236,7 +236,7 @@ } else { event = kbd->event; - switch(event->type) { + switch (event->type) { case STKBD_EV_CONNECT: drv_printk(KERN_INFO, "keyboard connected\n"); break; @@ -253,7 +253,7 @@ } return error; } - + static int stkbd_wait_for_events(struct stkbd_keyboard *kbd) { struct stkbd_event *event = kbd->event; @@ -271,7 +271,7 @@ } return error; } - + /* * Input driver hooks. * @@ -326,7 +326,7 @@ struct input_dev *idev; int error; - idev = input_allocate_device(); + idev = input_allocate_device(); if (!idev) { drv_printk(KERN_ERR, "failed to allocate input_dev\n"); return -ENOMEM; @@ -344,7 +344,7 @@ idev->open = stkbd_open; idev->close = stkbd_close; - + error = input_register_device(kbd->idev); if (error) { input_free_device(kbd->idev); @@ -420,36 +420,36 @@ static int stkbd_do_probe(struct device *dev) { - struct stkbd_keyboard *kbd; - int error; + struct stkbd_keyboard *kbd; + int error; - kbd = kzalloc(sizeof(*kbd), GFP_KERNEL); - if (!kbd) { - drv_printk(KERN_ERR, "failed to allocate stkbd_keyboard\n"); - return -ENOMEM; - } - dev_set_drvdata(dev, kbd); - kbd->dev = dev; + kbd = kzalloc(sizeof(*kbd), GFP_KERNEL); + if (!kbd) { + drv_printk(KERN_ERR, "failed to allocate stkbd_keyboard\n"); + return -ENOMEM; + } + dev_set_drvdata(dev, kbd); + kbd->dev = dev; - error = stkbd_init(kbd); - if (error) { - dev_set_drvdata(dev, NULL); - kfree(kbd); - } - return error; + error = stkbd_init(kbd); + if (error) { + dev_set_drvdata(dev, NULL); + kfree(kbd); + } + return error; } static int stkbd_do_remove(struct device *dev) { - struct stkbd_keyboard *kbd = dev_get_drvdata(dev); + struct stkbd_keyboard *kbd = dev_get_drvdata(dev); - if (kbd) { - stkbd_exit(kbd); - dev_set_drvdata(dev, NULL); - kfree(kbd); - return 0; - } - return -ENODEV; + if (kbd) { + stkbd_exit(kbd); + dev_set_drvdata(dev, NULL); + kfree(kbd); + return 0; + } + return -ENODEV; } @@ -459,30 +459,30 @@ */ static int __init stkbd_of_probe(struct of_device *odev, - const struct of_device_id *match) + const struct of_device_id *match) { - return stkbd_do_probe(&odev->dev); + return stkbd_do_probe(&odev->dev); } static int __exit stkbd_of_remove(struct of_device *odev) { - return stkbd_do_remove(&odev->dev); + return stkbd_do_remove(&odev->dev); } static struct of_device_id stkbd_of_match[] = { - { .compatible = "nintendo,starlet-keyboard" }, - { }, + { .compatible = "nintendo,starlet-keyboard" }, + { }, }; MODULE_DEVICE_TABLE(of, stkbd_of_match); static struct of_platform_driver stkbd_of_driver = { - .owner = THIS_MODULE, - .name = DRV_MODULE_NAME, - .match_table = stkbd_of_match, - .probe = stkbd_of_probe, - .remove = stkbd_of_remove, + .owner = THIS_MODULE, + .name = DRV_MODULE_NAME, + .match_table = stkbd_of_match, + .probe = stkbd_of_probe, + .remove = stkbd_of_remove, }; @@ -493,15 +493,15 @@ static int __init stkbd_init_module(void) { - drv_printk(KERN_INFO, "%s - version %s\n", DRV_DESCRIPTION, - stkbd_driver_version); + drv_printk(KERN_INFO, "%s - version %s\n", DRV_DESCRIPTION, + stkbd_driver_version); - return of_register_platform_driver(&stkbd_of_driver); + return of_register_platform_driver(&stkbd_of_driver); } static void __exit stkbd_exit_module(void) { - of_unregister_platform_driver(&stkbd_of_driver); + of_unregister_platform_driver(&stkbd_of_driver); } module_init(stkbd_init_module); @@ -510,4 +510,3 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_AUTHOR(DRV_AUTHOR); MODULE_LICENSE("GPL"); - |
