summaryrefslogtreecommitdiffstats
path: root/drivers/usb/input/hid-tmff.c
diff options
context:
space:
mode:
authorDmitry Torokhov2005-09-15 09:01:47 +0200
committerGreg Kroah-Hartman2005-10-28 18:52:52 +0200
commitc5b7c7c395a34f12cdf246d66c1feeff2933d584 (patch)
tree8af335c30bb92991f4bfd8251de4fed9907b07bd /drivers/usb/input/hid-tmff.c
parent[PATCH] drivers/input/keyboard: convert to dynamic input_dev allocation (diff)
downloadkernel-qcow2-linux-c5b7c7c395a34f12cdf246d66c1feeff2933d584.tar.gz
kernel-qcow2-linux-c5b7c7c395a34f12cdf246d66c1feeff2933d584.tar.xz
kernel-qcow2-linux-c5b7c7c395a34f12cdf246d66c1feeff2933d584.zip
[PATCH] drivers/usb/input: convert to dynamic input_dev allocation
Input: convert drivers/iusb/input 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>
Diffstat (limited to 'drivers/usb/input/hid-tmff.c')
-rw-r--r--drivers/usb/input/hid-tmff.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/input/hid-tmff.c b/drivers/usb/input/hid-tmff.c
index 8f6a0a6f94a9..023fd5ac31c8 100644
--- a/drivers/usb/input/hid-tmff.c
+++ b/drivers/usb/input/hid-tmff.c
@@ -111,6 +111,7 @@ int hid_tmff_init(struct hid_device *hid)
struct tmff_device *private;
struct list_head *pos;
struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list);
+ struct input_dev *input_dev = hidinput->input;
private = kmalloc(sizeof(struct tmff_device), GFP_KERNEL);
if (!private)
@@ -155,7 +156,7 @@ int hid_tmff_init(struct hid_device *hid)
private->report = report;
private->rumble = field;
- set_bit(FF_RUMBLE, hidinput->input.ffbit);
+ set_bit(FF_RUMBLE, input_dev->ffbit);
break;
default:
@@ -164,11 +165,11 @@ int hid_tmff_init(struct hid_device *hid)
}
/* Fallthrough to here only when a valid usage is found */
- hidinput->input.upload_effect = hid_tmff_upload_effect;
- hidinput->input.flush = hid_tmff_flush;
+ input_dev->upload_effect = hid_tmff_upload_effect;
+ input_dev->flush = hid_tmff_flush;
- set_bit(EV_FF, hidinput->input.evbit);
- hidinput->input.ff_effects_max = TMFF_EFFECTS;
+ set_bit(EV_FF, input_dev->evbit);
+ input_dev->ff_effects_max = TMFF_EFFECTS;
}
}