[patch] input: use event handler in ff drivers

Anssi Hannula
2006-05-27T00:53:37Z

[-- Attachment #1: Type: text/plain, Size: 404 bytes --]

Call input_ff_event() from drivers when they receive EV_FF event through
event() of struct input_dev.

Signed-off-by: Anssi Hannula <anssi.hannula@gmail.com>

---

This is to be applied after other patches in my last patchset.

input/joystick/iforce/iforce-main.c | 1 +
input/misc/uinput.c | 3 +++
usb/input/hid-input.c | 3 +++
3 files changed, 7 insertions(+)

[-- Attachment #2: ff-refactoring-use-event-handler-in-drivers.diff --]
[-- Type: text/x-patch, Size: 1704 bytes --]

Index: linux-2.6.17-rc4-git12/drivers/usb/input/hid-input.c
===================================================================
--- linux-2.6.17-rc4-git12.orig/drivers/usb/input/hid-input.c 2006-05-27 03:45:06.000000000 +0300
+++ linux-2.6.17-rc4-git12/drivers/usb/input/hid-input.c 2006-05-27 03:45:07.000000000 +0300
@@ -717,6 +717,9 @@ static int hidinput_input_event(struct i
struct hid_field *field;
int offset;

+ if (type == EV_FF)
+ return input_ff_event(dev, type, code, value);
+
if (type != EV_LED)
return -1;

Index: linux-2.6.17-rc4-git12/drivers/input/joystick/iforce/iforce-main.c
===================================================================
--- linux-2.6.17-rc4-git12.orig/drivers/input/joystick/iforce/iforce-main.c 2006-05-27 03:45:06.000000000 +0300
+++ linux-2.6.17-rc4-git12/drivers/input/joystick/iforce/iforce-main.c 2006-05-27 03:45:07.000000000 +0300
@@ -306,6 +306,7 @@ int iforce_init_device(struct iforce *if
input_dev->name = "Unknown I-Force device";
input_dev->open = iforce_open;
input_dev->close = iforce_release;
+ input_dev->event = input_ff_event;
if (!ff_err)
input_dev->ff_effects_max = 10;

Index: linux-2.6.17-rc4-git12/drivers/input/misc/uinput.c
===================================================================
--- linux-2.6.17-rc4-git12.orig/drivers/input/misc/uinput.c 2006-05-27 03:45:06.000000000 +0300
+++ linux-2.6.17-rc4-git12/drivers/input/misc/uinput.c 2006-05-27 03:45:07.000000000 +0300
@@ -43,6 +43,9 @@ static int uinput_dev_event(struct input
{
struct uinput_device *udev;

+ if (type == EV_FF)
+ return input_ff_event(dev, type, code, value);
+
udev = dev->private;

udev->buff[udev->head].type = type;