include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / hid / hid-tmff.c

diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c
index be7ebe2..15434c8 100644 (file)
--- a/drivers/hid/hid-tmff.c
+++ b/drivers/hid/hid-tmff.c
@@ -29,15 +29,11 @@
 
 #include <linux/hid.h>
 #include <linux/input.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 
 #include "hid-ids.h"
 
-#include "usbhid/usbhid.h"
-
-/* Usages for thrustmaster devices I know about */
-#define THRUSTMASTER_USAGE_FF  (HID_UP_GENDESK | 0xbb)
-
 static const signed short ff_rumble[] = {
        FF_RUMBLE,
        -1
@@ -48,6 +44,12 @@ static const signed short ff_joystick[] = {
        -1
 };
 
+#ifdef CONFIG_THRUSTMASTER_FF
+#include "usbhid/usbhid.h"
+
+/* Usages for thrustmaster devices I know about */
+#define THRUSTMASTER_USAGE_FF  (HID_UP_GENDESK | 0xbb)
+
 struct tmff_device {
        struct hid_report *report;
        struct hid_field *ff_field;
@@ -149,27 +151,28 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
                        switch (field->usage[0].hid) {
                        case THRUSTMASTER_USAGE_FF:
                                if (field->report_count < 2) {
-                                       warn("ignoring FF field with "
-                                                       "report_count < 2");
+                                       dev_warn(&hid->dev, "ignoring FF field "
+                                               "with report_count < 2\n");
                                        continue;
                                }
 
                                if (field->logical_maximum ==
                                                field->logical_minimum) {
-                                       warn("ignoring FF field with "
-                                                       "logical_maximum == "
-                                                       "logical_minimum");
+                                       dev_warn(&hid->dev, "ignoring FF field "
+                                                       "with logical_maximum "
+                                                       "== logical_minimum\n");
                                        continue;
                                }
 
                                if (tmff->report && tmff->report != report) {
-                                       warn("ignoring FF field in other "
-                                                       "report");
+                                       dev_warn(&hid->dev, "ignoring FF field "
+                                                       "in other report\n");
                                        continue;
                                }
 
                                if (tmff->ff_field && tmff->ff_field != field) {
-                                       warn("ignoring duplicate FF field");
+                                       dev_warn(&hid->dev, "ignoring "
+                                                       "duplicate FF field\n");
                                        continue;
                                }
 
@@ -182,7 +185,8 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
                                break;
 
                        default:
-                               warn("ignoring unknown output usage %08x",
+                               dev_warn(&hid->dev, "ignoring unknown output "
+                                               "usage %08x\n",
                                                field->usage[0].hid);
                                continue;
                        }
@@ -190,7 +194,7 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
        }
 
        if (!tmff->report) {
-               err("cant find FF field in output reports\n");
+               dev_err(&hid->dev, "can't find FF field in output reports\n");
                error = -ENODEV;
                goto fail;
        }
@@ -199,14 +203,20 @@ static int tmff_init(struct hid_device *hid, const signed short *ff_bits)
        if (error)
                goto fail;
 
-       info("Force feedback for ThrustMaster devices by Zinx Verituse "
-                       "<zinx@epicsol.org>");
+       dev_info(&hid->dev, "force feedback for ThrustMaster devices by Zinx "
+                       "Verituse <zinx@epicsol.org>");
        return 0;
 
 fail:
        kfree(tmff);
        return error;
 }
+#else
+static inline int tmff_init(struct hid_device *hid, const signed short *ff_bits)
+{
+       return 0;
+}
+#endif
 
 static int tm_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
@@ -234,10 +244,16 @@ err:
 static const struct hid_device_id tm_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300),
                .driver_data = (unsigned long)ff_rumble },
-       { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304),
+       { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304),   /* FireStorm Dual Power 2 (and 3) */
+               .driver_data = (unsigned long)ff_rumble },
+       { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323),   /* Dual Trigger 3-in-1 (PC Mode) */
+               .driver_data = (unsigned long)ff_rumble },
+       { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb324),   /* Dual Trigger 3-in-1 (PS3 Mode) */
                .driver_data = (unsigned long)ff_rumble },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651),   /* FGT Rumble Force Wheel */
                .driver_data = (unsigned long)ff_rumble },
+       { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653),   /* RGT Force Feedback CLUTCH Raging Wheel */
+               .driver_data = (unsigned long)ff_joystick },
        { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654),   /* FGT Force Feedback Wheel */
                .driver_data = (unsigned long)ff_joystick },
        { }
@@ -250,12 +266,12 @@ static struct hid_driver tm_driver = {
        .probe = tm_probe,
 };
 
-static int tm_init(void)
+static int __init tm_init(void)
 {
        return hid_register_driver(&tm_driver);
 }
 
-static void tm_exit(void)
+static void __exit tm_exit(void)
 {
        hid_unregister_driver(&tm_driver);
 }
@@ -263,5 +279,3 @@ static void tm_exit(void)
 module_init(tm_init);
 module_exit(tm_exit);
 MODULE_LICENSE("GPL");
-
-HID_COMPAT_LOAD_DRIVER(thrustmaster);