aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] Correct misc_register return code handling in several driversNeil Horman2006-12-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Clean up several code points in which the return code from misc_register is not handled properly. Several modules failed to deregister various hooks when misc_register fails, and this patch cleans them up. Also there are a few modules that legitimately don't care about the failure status of misc register. These drivers however unilaterally call misc_deregister on module unload. Since misc_register doesn't initialize the list_head in the init_routine if it fails, the deregister operation is at risk for oopsing when list_del is called. The initial solution was to manually init the list in the miscdev structure in each of those modules, but the consensus in this thread was to consolodate and do that universally inside misc_register. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Kylene Jo Hall <kjhall@us.ibm.com> Cc: Dmitry Torokhov <dtor@mail.ru> Cc: Olaf Hering <olh@suse.de> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] hp drivers/input stuff: C99 initializers, NULL noise removal, __user ↵Al Viro2006-10-151-4/+4
| | | | | | | annotations Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Use linux/io.h instead of asm/io.hMatthew Wilcox2006-10-111-1/+1
| | | | | | | | | In preparation for moving check_signature, change these users from asm/io.h to linux/io.h Signed-off-by: Matthew Wilcox <willy@parisc-linux.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68k/HP300: Enable HIL configuration optionsGeert Uytterhoeven2006-10-091-1/+1
| | | | | | | | Enable HIL configuration options on HP300 Signed-off-by: Kars de Jong <jongk@linux-m68k.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* IRQ: Maintain regs pointer globally rather than passing to IRQ handlersDavid Howells2006-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maintain a per-CPU global "struct pt_regs *" variable which can be used instead of passing regs around manually through all ~1800 interrupt handlers in the Linux kernel. The regs pointer is used in few places, but it potentially costs both stack space and code to pass it around. On the FRV arch, removing the regs parameter from all the genirq function results in a 20% speed up of the IRQ exit path (ie: from leaving timer_interrupt() to leaving do_IRQ()). Where appropriate, an arch may override the generic storage facility and do something different with the variable. On FRV, for instance, the address is maintained in GR28 at all times inside the kernel as part of general exception handling. Having looked over the code, it appears that the parameter may be handed down through up to twenty or so layers of functions. Consider a USB character device attached to a USB hub, attached to a USB controller that posts its interrupts through a cascaded auxiliary interrupt controller. A character device driver may want to pass regs to the sysrq handler through the input layer which adds another few layers of parameter passing. I've build this code with allyesconfig for x86_64 and i386. I've runtested the main part of the code on FRV and i386, though I can't test most of the drivers. I've also done partial conversion for powerpc and MIPS - these at least compile with minimal configurations. This will affect all archs. Mostly the changes should be relatively easy. Take do_IRQ(), store the regs pointer at the beginning, saving the old one: struct pt_regs *old_regs = set_irq_regs(regs); And put the old one back at the end: set_irq_regs(old_regs); Don't pass regs through to generic_handle_irq() or __do_IRQ(). In timer_interrupt(), this sort of change will be necessary: - update_process_times(user_mode(regs)); - profile_tick(CPU_PROFILING, regs); + update_process_times(user_mode(get_irq_regs())); + profile_tick(CPU_PROFILING); I'd like to move update_process_times()'s use of get_irq_regs() into itself, except that i386, alone of the archs, uses something other than user_mode(). Some notes on the interrupt handling in the drivers: (*) input_dev() is now gone entirely. The regs pointer is no longer stored in the input_dev struct. (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does something different depending on whether it's been supplied with a regs pointer or not. (*) Various IRQ handler function pointers have been moved to type irq_handler_t. Signed-Off-By: David Howells <dhowells@redhat.com> (cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit)
* Input: wistron - add support for Acer TravelMate 2424NWXCiAshutosh Naik2006-10-011-1/+10
| | | | | | | | The key mappings are the same as the older Acer TravelMate 240. Signed-off-by: Ashutosh Naik <ashutosh.naik@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: wistron - fix setting up special buttonsReiner Herrmann2006-10-011-5/+2
| | | | | | | | | If either wifi or bluetooth button has been detected, the code would break off the loop. But there are laptops that have both types of buttons, so the loop has to continue checking. Signed-off-by: Reiner Herrmann <reiner@reiner-h.de> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Dmitry Torokhov2006-09-191-8/+8
|\
| * Input: wistron - fix crash due to referencing __initdataDmitry Torokhov2006-08-231-8/+8
| | | | | | | | | | | | | | Remove __initdata markings from keymaps as they are used during normal driver operations. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: uinput - switch to the new FF interfaceAnssi Hannula2006-07-191-16/+51
|/ | | | | | | | | The userspace interface of the force feedback part is changed and documentation in uinput.h is updated accordingly. MODULE_VERSION is also incremented to reflect the revision. Signed-off-by: Anssi Hannula <anssi.hannula@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: wistron - fix section reference mismatchesAndrew Morton2006-07-061-10/+10
| | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* [PATCH] irq-flags: misc drivers: Use the new IRQF_ constantsThomas Gleixner2006-07-021-1/+1
| | | | | | | | | Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Cc: "David S. Miller" <davem@davemloft.net> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Remove obsolete #include <linux/config.h>Jörn Engel2006-06-301-1/+0
| | | | | Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de> Signed-off-by: Adrian Bunk <bunk@stusta.de>
* Input: wistron - add mapping for Wistron MS 2111Frank de Lange2006-06-271-0/+19
| | | | | | | | | Wistron MS 2111 (aka Medion 'Titanium' MD 9783, aka ALDI PC, aka Fujitsu-Siemens AMILO D7800, aka ...) has 5 extra buttons, map them. Unfortunately we only have DMI data for the Medion box. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* [SPARC64]: Add of_device layer and make ebus/isa use it.David S. Miller2006-06-232-96/+124
| | | | | | | | | | Sparcspkr and power drivers are converted, to make sure it works. Eventually the SBUS device layer will use this as a sub-class. I really cannot cut loose on that bit until sparc32 is given the same infrastructure. Signed-off-by: David S. Miller <davem@davemloft.net>
* [SPARC64]: Use in-kernel PROM tree for EBUS and ISA.David S. Miller2006-06-231-2/+2
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* Input: wistron - add support for AOpen Barebook 1559asmasc@theaterzentrum.at2006-05-291-0/+19
| | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: wistron - add support for Fujitsu N3510John Reed Riley2006-04-051-0/+21
| | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: wistron - add signature for Amilo M7400Stefan Rompf2006-04-051-0/+9
| | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: pcspkr - separate device and driver registrationMichael Neuling2006-03-141-26/+1
| | | | | | | | | | | | | The current pcspkr code combines the device and driver registration. This patch splits these, putting the device registration in the arch specific code. PowerPC and MIPS only have the pcspkr present sometimes. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: uinput - semaphore to mutex conversionDmitry Torokhov2006-02-191-7/+7
| | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: kill remnants of 98kbd{,-io} and 98spkrArthur Othieno2006-02-151-1/+0
| | | | | | | | | 98kbd{,-io} and 98spkr all went out with PC98 subarch. Remove stale Makefile entries that remained. Signed-off-by: Arthur Othieno <apgo@patchbomb.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: ixp4xx-beeper - fix compile errorAlessandro Zummo2006-02-151-0/+1
| | | | | Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: add ixp4xx beeper driverAlessandro Zummo2006-01-293-0/+196
| | | | | | | | This is a driver for beeper found in LinkSys NSLU2 boxes. It should work on any ixp4xx based platform. Signed-off-by: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/inputLinus Torvalds2006-01-101-3/+3
|\
| * Input: wistron - do not crash if BIOS does not support interfaceMiloslav Trmac2006-01-101-3/+3
| | | | | | | | | | | | | | | | | | offset can never be < 0 because it has type size_t. The driver currently oopses on insmod if BIOS does not support the interface, instead of refusing to load. Signed-off-by: Miloslav Trmac <mitr@volny.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | [PATCH] small hp_sdc_rtc cleanup: use no_llseekMarcelo Tosatti2006-01-081-8/+1
|/ | | | | | | | | | | Use no_llseek function. Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Cc: "Brian S. Julin" <bri@calyx.com> Acked-by: Vojtech Pavlik <vojtech@suse.cz> Cc: Dmitry Torokhov <dtor_core@ameritech.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6Dmitry Torokhov2006-01-051-1/+1
|\
| * [SPARC]: introduce a SPARC Kconfig symbolAdrian Bunk2005-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | Introduce a Kconfig symbol SPARC that is defined on both the sparc and sparc64 architectures. This symbol makes some dependencies more readable. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Input: wistron - convert to the new platform device interfaceDmitry Torokhov2005-12-281-46/+68
| | | | | | | | | | | | | | | | Do not use platform_device_register_simple() as it is going away, implement ->probe() and ->remove() functions so manual binding and unbinding would work. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: sparcspkr - register with driver core as a platfrom deviceDmitry Torokhov2005-12-211-57/+105
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: m68kspkr - register with driver core as a platfrom deviceDmitry Torokhov2005-12-211-17/+85
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Input: pcspkr - register with driver core as a platfrom deviceDmitry Torokhov2005-12-211-6/+80
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)Dmitry Torokhov2005-12-201-1/+1
|\ \ | |/
| * [PATCH] drivers/input/misc/wistron_btns.c NULL noise removalAl Viro2005-12-151-1/+1
| | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | Input: wistron - add Acer TravelMate 240 to DMI tableAshutosh Naik2005-12-111-0/+19
|/ | | | | Signed-off-by: Ashutosh Naik <ashutosh.naik@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: uinput - don't use "interruptible" in FF codeDmitry Torokhov2005-11-201-8/+3
| | | | | | | | | If thread that submitted FF request gets interrupted somehow it will release request structure and ioctl handler will work with freed memory. TO prevent that from happening switch to using wait_for_completion instead of wait_for_completion_interruptible. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: uinput - add UI_SET_SWBIT ioctlDmitry Torokhov2005-11-201-0/+4
| | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: uinput - convert to dynalloc allocationDmitry Torokhov2005-11-201-147/+163
| | | | | | Also introduce proper locking when creating/deleting device. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: wistron - disable wifi/bluetooth on suspendMiloslav Trmac2005-11-201-0/+6
| | | | | | | Try to save battery power by disabling wifi and bluetooth on suspend. Signed-off-by: Miloslav Trmac <mitr@volny.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: wistron - add PM supportDmitry Torokhov2005-11-201-5/+57
| | | | | | | Register wistron-bios as a platform device, restore WIFI and Bluetooth state upon resume. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: wistron - convert to dynamic input_dev allocationDmitry Torokhov2005-11-201-16/+37
| | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: wistron - add support for Acer Aspire 1500 notebooksBernhard Rosenkraenzer2005-11-201-20/+59
| | | | | | | | | | | | | | Also fix a potential issue with some notebooks: The current code assumes the response to bios_wifi_get_default_setting is either 1 (disabled) or 3 (enabled), or wifi isn't supported. The BIOS response appears to be a bit field w/ 0x1 indicating hardware presence, 0x2 indicating actiation status, and the other 6 bits being unknown/reserved -- with the patch, these 6 bits are ignored. Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: wistron - disable for x86_64Andrew Morton2005-11-201-1/+1
| | | | | | | | | | On x86_64: {standard input}:233: Error: suffix or operands invalid for `push' {standard input}:233: Error: suffix or operands invalid for `pop' Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* Input: add Wistron driverDmitry Torokhov2005-11-203-0/+454
| | | | | | | | | | | | | | | | | | | | | | | A driver for laptop buttons using an x86 BIOS interface that is apparently used on quite a few laptops and seems to be originating from Wistron. This driver currently "knows" only about Fujitsu-Siemens Amilo Pro V2000 (i.e. it can detect the laptop using DMI and it contains the keycode->key meaning mapping for this laptop) and Xeron SonicPro X 155G (probably can't be reliably autodetected, requires a module parameter), adding other laptops should be easy. In addition to reporting button presses to the input layer the driver also allows enabling/disabling the embedded wireless NIC (using the "Wifi" button); this is done using the same BIOS interface, so it seems only logical to keep the implementation together. Any flexibility possibly gained by allowing users to remap the function of the "Wifi" button is IMHO not worth it when weighted against the necessity to run an user-space daemon to convert button presses to wifi state changes. Signed-off-by: Miloslav Trmac <mitr@volny.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* [PATCH] kfree cleanup: misc remaining driversJesper Juhl2005-11-071-7/+3
| | | | | | | | | | | | | | | | | | This is the remaining misc drivers/ part of the big kfree cleanup patch. Remove pointless checks for NULL prior to calling kfree() in misc files in drivers/. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Acked-by: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org> Acked-by: Roland Dreier <rolandd@cisco.com> Acked-by: Pierre Ossman <drzeus@drzeus.cx> Acked-by: Jean Delvare <khali@linux-fr.org> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Len Brown <len.brown@intel.com> Acked-by: "Antonino A. Daplas" <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Input: pcspkr - fix setting name and phys for the deviceDmitry Torokhov2005-10-311-1/+1
| | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* [PATCH] CONFIG_IA32Brian Gerst2005-10-301-1/+1
| | | | | | | | | | | | | Add CONFIG_X86_32 for i386. This allows selecting options that only apply to 32-bit systems. (X86 && !X86_64) becomes X86_32 (X86 || X86_64) becomes X86 Signed-off-by: Brian Gerst <bgerst@didntduck.org> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] missing bits in sparkspkr conversionAl Viro2005-10-291-1/+1
| | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Input: convert driver/input/misc to dynamic input_dev allocationDmitry Torokhov2005-10-283-57/+56
| | | | | | | | | Input: convert driver/input/misc to dynamic input_dev allocation This is required for input_dev sysfs integration Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>