HID: use hid_hw_request() instead of direct call to usbhid

[linux-2.6-block.git] / drivers / hid / hid-holtekff.c

diff --git a/drivers/hid/hid-holtekff.c b/drivers/hid/hid-holtekff.c
index ff295e60059b25e8d49d3fa31881decda3b0014c..9a8f051245258973f53ad84f8debef8b2f6db7e9 100644 (file)
--- a/drivers/hid/hid-holtekff.c
+++ b/drivers/hid/hid-holtekff.c
@@ -27,12 +27,10 @@
 #include <linux/input.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/usb.h>
 
 #include "hid-ids.h"
 
 #ifdef CONFIG_HOLTEK_FF
-#include "usbhid/usbhid.h"
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Anssi Hannula <anssi.hannula@iki.fi>");
@@ -102,7 +100,7 @@ static void holtekff_send(struct holtekff_device *holtekff,
 
        dbg_hid("sending %*ph\n", 7, data);
 
-       usbhid_submit_report(hid, holtekff->field->report, USB_DIR_OUT);
+       hid_hw_request(hid, holtekff->field->report, HID_REQ_SET_REPORT);
 }
 
 static int holtekff_play(struct input_dev *dev, void *data,
@@ -224,17 +222,4 @@ static struct hid_driver holtek_driver = {
        .id_table = holtek_devices,
        .probe = holtek_probe,
 };
-
-static int __init holtek_init(void)
-{
-       return hid_register_driver(&holtek_driver);
-}
-
-static void __exit holtek_exit(void)
-{
-       hid_unregister_driver(&holtek_driver);
-}
-
-module_init(holtek_init);
-module_exit(holtek_exit);
-
+module_hid_driver(holtek_driver);