* [PATCH 1/5] grip_mp: small cleanup
2006-01-10 7:09 [PATCH 0/5] Tiny input update for 2.6.15 Dmitry Torokhov
@ 2006-01-10 7:09 ` Dmitry Torokhov
2006-01-10 7:09 ` [PATCH 2/5] wistron: do not crash if BIOS does not support interface Dmitry Torokhov
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2006-01-10 7:09 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Vojtech Pavlik, LKML
[-- Attachment #1: grip_mp-cleanup.patch --]
[-- Type: text/plain, Size: 801 bytes --]
Input: grip_mp - kill commented out code
Kill leftovers of dynalloc conversion.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/input/joystick/grip_mp.c | 9 ---------
1 files changed, 9 deletions(-)
Index: work/drivers/input/joystick/grip_mp.c
===================================================================
--- work.orig/drivers/input/joystick/grip_mp.c
+++ 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? */
};
/*
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/5] wistron: do not crash if BIOS does not support interface
2006-01-10 7:09 [PATCH 0/5] Tiny input update for 2.6.15 Dmitry Torokhov
2006-01-10 7:09 ` [PATCH 1/5] grip_mp: small cleanup Dmitry Torokhov
@ 2006-01-10 7:09 ` Dmitry Torokhov
2006-01-10 7:09 ` [PATCH 3/5] Input core: prepare for fops constness Dmitry Torokhov
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2006-01-10 7:09 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Vojtech Pavlik, LKML, Miloslav Trmac
[-- Attachment #1: wistron-no-entry.patch --]
[-- Type: text/plain, Size: 1337 bytes --]
From: Miloslav Trmac <mitr@volny.cz>
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.
Signed-off-by: Miloslav Trmac <mitr@volny.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/input/misc/wistron_btns.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Index: work/drivers/input/misc/wistron_btns.c
===================================================================
--- work.orig/drivers/input/misc/wistron_btns.c
+++ 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 */
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 3/5] Input core: prepare for fops constness
2006-01-10 7:09 [PATCH 0/5] Tiny input update for 2.6.15 Dmitry Torokhov
2006-01-10 7:09 ` [PATCH 1/5] grip_mp: small cleanup Dmitry Torokhov
2006-01-10 7:09 ` [PATCH 2/5] wistron: do not crash if BIOS does not support interface Dmitry Torokhov
@ 2006-01-10 7:09 ` Dmitry Torokhov
2006-01-10 7:09 ` [PATCH 4/5] Remove obsolete maple input drivers Dmitry Torokhov
2006-01-10 7:09 ` [PATCH 5/5] ibmasm: fix input initialization error path Dmitry Torokhov
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2006-01-10 7:09 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Vojtech Pavlik, LKML, Arjan van de Ven
[-- Attachment #1: input-fops.patch --]
[-- Type: text/plain, Size: 926 bytes --]
From: Arjan van de Ven <arjan@infradead.org>
Input: prepare for f_ops constness
Avoid doing assignments to a live ->fops so it can be marked as 'const'.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/input/input.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: work/drivers/input/input.c
===================================================================
--- work.orig/drivers/input/input.c
+++ 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)
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 4/5] Remove obsolete maple input drivers
2006-01-10 7:09 [PATCH 0/5] Tiny input update for 2.6.15 Dmitry Torokhov
` (2 preceding siblings ...)
2006-01-10 7:09 ` [PATCH 3/5] Input core: prepare for fops constness Dmitry Torokhov
@ 2006-01-10 7:09 ` Dmitry Torokhov
2006-01-10 7:09 ` [PATCH 5/5] ibmasm: fix input initialization error path Dmitry Torokhov
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2006-01-10 7:09 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Vojtech Pavlik, LKML, Paul Mundt
[-- Attachment #1: maple-drivers-remove.patch --]
[-- Type: text/plain, Size: 5700 bytes --]
From: Paul Mundt <lethal@linux-sh.org>
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.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
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(-)
Index: work/drivers/input/keyboard/Kconfig
===================================================================
--- work.orig/drivers/input/keyboard/Kconfig
+++ 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
Index: work/drivers/input/keyboard/Makefile
===================================================================
--- work.orig/drivers/input/keyboard/Makefile
+++ 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
Index: work/drivers/input/mouse/Kconfig
===================================================================
--- work.orig/drivers/input/mouse/Kconfig
+++ 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
Index: work/drivers/input/mouse/Makefile
===================================================================
--- work.orig/drivers/input/mouse/Makefile
+++ 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
Index: work/drivers/input/mouse/maplemouse.c
===================================================================
--- work.orig/drivers/input/mouse/maplemouse.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * $Id: maplemouse.c,v 1.2 2004/03/22 01:18:15 lethal Exp $
- * SEGA Dreamcast mouse driver
- * Based on drivers/usb/usbmouse.c
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/input.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/timer.h>
-#include <linux/maple.h>
-
-MODULE_AUTHOR("YAEGASHI Takeshi <t@keshi.org>");
-MODULE_DESCRIPTION("SEGA Dreamcast mouse driver");
-
-static void dc_mouse_callback(struct mapleq *mq)
-{
- int buttons, relx, rely, relz;
- struct maple_device *mapledev = mq->dev;
- struct input_dev *dev = mapledev->private_data;
- unsigned char *res = mq->recvbuf;
-
- buttons = ~res[8];
- relx = *(unsigned short *)(res + 12) - 512;
- rely = *(unsigned short *)(res + 14) - 512;
- relz = *(unsigned short *)(res + 16) - 512;
-
- input_report_key(dev, BTN_LEFT, buttons & 4);
- input_report_key(dev, BTN_MIDDLE, buttons & 9);
- input_report_key(dev, BTN_RIGHT, buttons & 2);
- input_report_rel(dev, REL_X, relx);
- input_report_rel(dev, REL_Y, rely);
- input_report_rel(dev, REL_WHEEL, relz);
- input_sync(dev);
-}
-
-static int dc_mouse_connect(struct maple_device *dev)
-{
- unsigned long data = be32_to_cpu(dev->devinfo.function_data[0]);
- struct input_dev *input_dev;
-
- dev->private_data = input_dev = input_allocate_device();
- if (!input_dev)
- return -ENOMEM;
-
- dev->private_data = input_dev;
-
- input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
- input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_RIGHT) | BIT(BTN_MIDDLE);
- input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y) | BIT(REL_WHEEL);
-
- input_dev->name = dev->product_name;
- input_dev->id.bustype = BUS_MAPLE;
-
- input_register_device(input_dev);
-
- maple_getcond_callback(dev, dc_mouse_callback, 1, MAPLE_FUNC_MOUSE);
-
- return 0;
-}
-
-
-static void dc_mouse_disconnect(struct maple_device *dev)
-{
- struct input_dev *input_dev = dev->private_data;
-
- input_unregister_device(input_dev);
-}
-
-
-static struct maple_driver dc_mouse_driver = {
- .function = MAPLE_FUNC_MOUSE,
- .name = "Dreamcast mouse",
- .connect = dc_mouse_connect,
- .disconnect = dc_mouse_disconnect,
-};
-
-
-static int __init dc_mouse_init(void)
-{
- maple_register_driver(&dc_mouse_driver);
- return 0;
-}
-
-
-static void __exit dc_mouse_exit(void)
-{
- maple_unregister_driver(&dc_mouse_driver);
-}
-
-
-module_init(dc_mouse_init);
-module_exit(dc_mouse_exit);
-
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 5/5] ibmasm: fix input initialization error path
2006-01-10 7:09 [PATCH 0/5] Tiny input update for 2.6.15 Dmitry Torokhov
` (3 preceding siblings ...)
2006-01-10 7:09 ` [PATCH 4/5] Remove obsolete maple input drivers Dmitry Torokhov
@ 2006-01-10 7:09 ` Dmitry Torokhov
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2006-01-10 7:09 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Vojtech Pavlik, LKML, Vernon Mauery
[-- Attachment #1: ibmasm-register-fix.patch --]
[-- Type: text/plain, Size: 805 bytes --]
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 <vernux@us.ibm.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/misc/ibmasm/remote.c | 1 +
1 files changed, 1 insertion(+)
Index: work/drivers/misc/ibmasm/remote.c
===================================================================
--- work.orig/drivers/misc/ibmasm/remote.c
+++ 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);
^ permalink raw reply [flat|nested] 6+ messages in thread