Skip to contentSkip to conversation

Tiny input update for 2.6.15

PATCH New Dmitry Torokhov 1 participant 6 messages Jan 10, 2006

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover Tiny input update for 2.6.15

Hi Linus, please consider pulling from:

rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git/
or
master.kernel.org:/pub/scm/linux/kernel/git/dtor/input.git/

Changelog:
Input: ibmasm - fix input initialization error path
Input: remove obsolete maple input drivers (Paul Mundt)
Input: prepare for f_ops constness (Arjan van de Ven)
Input: wistron - do not crash if BIOS does not support interface (Miloslav Trmac)
Input: grip_mp - kill commented out code

Diffstat:

 drivers/input/input.c             |    2 
 drivers/input/joystick/grip_mp.c  |    9 ---
 drivers/input/keyboard/Kconfig    |   10 ---
 drivers/input/keyboard/Makefile   |    1 
 drivers/input/misc/wistron_btns.c |    6 +-
 drivers/input/mouse/Kconfig       |   10 ---
 drivers/input/mouse/Makefile      |    1 
 drivers/misc/ibmasm/remote.c      |    1 
 drivers/input/mouse/maplemouse.c  |  101 ------------------------------------
 9 files changed, 5 insertions(+), 136 deletions(-)

--
Dmitry

#1 lore raw

PATCH 1/5 grip_mp: small cleanup

Input: grip_mp - kill commented out code

Kill leftovers of dynalloc conversion.

---

 drivers/input/joystick/grip_mp.c |    9 ---------
 1 files changed, 9 deletions(-)
drivers/input/joystick/grip_mp.c +0 -9
Index: work/drivers/input/joystick/grip_mp.c
===================================================================
@@ -53,17 +53,8 @@ struct grip_port {
 struct grip_mp {
 	struct gameport *gameport;
 	struct grip_port *port[GRIP_MAX_PORTS];
-//	struct input_dev *dev[4];
-//	int mode[4];
-//	int registered[4];
 	int reads;
 	int bads;
-
-	/* individual gamepad states */
-//	int buttons[4];
-//	int xaxes[4];
-//	int yaxes[4];
-//	int dirty[4];     /* has the state been updated? */
 };
 
 /*
#2 lore raw

PATCH 2/5 wistron: do not crash if BIOS does not support interface

In reply to Dmitry Torokhov

From: Miloslav Trmac <[email protected]>

Input: wistron - do not crash if BIOS does not support interface

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.

---

 drivers/input/misc/wistron_btns.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/input/misc/wistron_btns.c +3 -3
Index: work/drivers/input/misc/wistron_btns.c
===================================================================
@@ -92,11 +92,11 @@ static void call_bios(struct regs *regs)
 	preempt_enable();
 }
 
-static size_t __init locate_wistron_bios(void __iomem *base)
+static ssize_t __init locate_wistron_bios(void __iomem *base)
 {
 	static const unsigned char __initdata signature[] =
 		{ 0x42, 0x21, 0x55, 0x30 };
-	size_t offset;
+	ssize_t offset;
 
 	for (offset = 0; offset < 0x10000; offset += 0x10) {
 		if (check_signature(base + offset, signature,
@@ -109,7 +109,7 @@ static size_t __init locate_wistron_bios
 static int __init map_bios(void)
 {
 	void __iomem *base;
-	size_t offset;
+	ssize_t offset;
 	u32 entry_point;
 
 	base = ioremap(0xF0000, 0x10000); /* Can't fail */
#3 lore raw

PATCH 3/5 Input core: prepare for fops constness

In reply to Dmitry Torokhov

From: Arjan van de Ven <[email protected]>

Input: prepare for f_ops constness

Avoid doing assignments to a live ->fops so it can be marked as 'const'.

---

 drivers/input/input.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)
drivers/input/input.c +1 -1
Index: work/drivers/input/input.c
===================================================================
@@ -477,8 +477,8 @@ static int __init input_proc_init(void)
 
 	entry->owner = THIS_MODULE;
 	input_fileops = *entry->proc_fops;
+	input_fileops.poll = input_devices_poll;
 	entry->proc_fops = &input_fileops;
-	entry->proc_fops->poll = input_devices_poll;
 
 	entry = create_proc_read_entry("handlers", 0, proc_bus_input_dir, input_handlers_read, NULL);
 	if (!entry)
#4 lore raw

PATCH 4/5 Remove obsolete maple input drivers

In reply to Dmitry Torokhov

From: Paul Mundt <[email protected]>

Input: remove obsolete maple input drivers

These haven't worked in some time, and we've dropped support for the bus from the SH tree until someone shows some interest in maintaining it.

---

 drivers/input/mouse/maplemouse.c |  101 ---------------------------------------
 drivers/input/keyboard/Kconfig   |   10 ---
 drivers/input/keyboard/Makefile  |    1 
 drivers/input/mouse/Kconfig      |   10 ---
 drivers/input/mouse/Makefile     |    1 
 5 files changed, 123 deletions(-)
drivers/input/keyboard/Kconfig +0 -10
Index: work/drivers/input/keyboard/Kconfig
===================================================================
@@ -143,16 +143,6 @@ config KEYBOARD_SPITZ
 	  To compile this driver as a module, choose M here: the
 	  module will be called spitzkbd.
 
-config KEYBOARD_MAPLE
-	tristate "Maple bus keyboard"
-	depends on SH_DREAMCAST && MAPLE
-	help
-	  Say Y here if you have a DreamCast console running Linux and have
-	  a keyboard attached to its Maple bus.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called maple_keyb.
-
 config KEYBOARD_AMIGA
 	tristate "Amiga keyboard"
 	depends on AMIGA
drivers/input/keyboard/Makefile +0 -1
Index: work/drivers/input/keyboard/Makefile
===================================================================
@@ -5,7 +5,6 @@
 # Each configuration option enables a list of files.
 
 obj-$(CONFIG_KEYBOARD_ATKBD)		+= atkbd.o
-obj-$(CONFIG_KEYBOARD_MAPLE)		+= maple_keyb.o
 obj-$(CONFIG_KEYBOARD_SUNKBD)		+= sunkbd.o
 obj-$(CONFIG_KEYBOARD_LKKBD)		+= lkkbd.o
 obj-$(CONFIG_KEYBOARD_XTKBD)		+= xtkbd.o
drivers/input/mouse/Kconfig +0 -10
Index: work/drivers/input/mouse/Kconfig
===================================================================
@@ -86,16 +86,6 @@ config MOUSE_PC110PAD
 	  To compile this driver as a module, choose M here: the
 	  module will be called pc110pad.
 
-config MOUSE_MAPLE
-	tristate "Maple bus mouse"
-	depends on SH_DREAMCAST && MAPLE
-	help
-	  Say Y if you have a DreamCast console and a mouse attached to
-	  its Maple bus.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called maplemouse.
-
 config MOUSE_AMIGA
 	tristate "Amiga mouse"
 	depends on AMIGA
drivers/input/mouse/Makefile +0 -1
Index: work/drivers/input/mouse/Makefile
===================================================================
@@ -8,7 +8,6 @@ obj-$(CONFIG_MOUSE_AMIGA)	+= amimouse.o
 obj-$(CONFIG_MOUSE_RISCPC)	+= rpcmouse.o
 obj-$(CONFIG_MOUSE_INPORT)	+= inport.o
 obj-$(CONFIG_MOUSE_LOGIBM)	+= logibm.o
-obj-$(CONFIG_MOUSE_MAPLE)	+= maplemouse.o
 obj-$(CONFIG_MOUSE_PC110PAD)	+= pc110pad.o
 obj-$(CONFIG_MOUSE_PS2)		+= psmouse.o
 obj-$(CONFIG_MOUSE_SERIAL)	+= sermouse.o
drivers/input/mouse/maplemouse.c deleted +0 -101

101 lines not on this page · raw message

#5 lore raw

PATCH 5/5 ibmasm: fix input initialization error path

In reply to Dmitry Torokhov

Input: ibmasm - fix input initialization error path

Do not try to free device that has already been unregistered, input_unregister_device() frees it automatically.

Spotted by Vernon Mauery <[email protected]>

---

 drivers/misc/ibmasm/remote.c |    1 +
 1 files changed, 1 insertion(+)
drivers/misc/ibmasm/remote.c +1 -0
Index: work/drivers/misc/ibmasm/remote.c
===================================================================
@@ -270,6 +270,7 @@ int ibmasm_init_remote_input_dev(struct 
 
  err_unregister_mouse_dev:
 	input_unregister_device(mouse_dev);
+	mouse_dev = NULL; /* so we don't try to free it again below */
  err_free_devices:
 	input_free_device(mouse_dev);
 	input_free_device(keybd_dev);