ucc_geth: migrate ucc_geth to phylib

[powerpc.git] / drivers / usb / input / hid-lgff.c

diff --git a/drivers/usb/input/hid-lgff.c b/drivers/usb/input/hid-lgff.c
index 93da222..e6f3af3 100644 (file)
--- a/drivers/usb/input/hid-lgff.c
+++ b/drivers/usb/input/hid-lgff.c
@@ -29,9 +29,10 @@
 
 #include <linux/input.h>
 #include <linux/usb.h>
-#include "hid.h"
+#include <linux/hid.h>
+#include "usbhid.h"
 
-struct device_type {
+struct dev_type {
        u16 idVendor;
        u16 idProduct;
        const signed short *ff;
@@ -47,11 +48,13 @@ static const signed short ff_joystick[] = {
        -1
 };
 
-static const struct device_type devices[] = {
+static const struct dev_type devices[] = {
        { 0x046d, 0xc211, ff_rumble },
        { 0x046d, 0xc219, ff_rumble },
        { 0x046d, 0xc283, ff_joystick },
-       { 0x0000, 0x0000, ff_joystick }
+       { 0x046d, 0xc294, ff_joystick },
+       { 0x046d, 0xc295, ff_joystick },
+       { 0x046d, 0xca03, ff_joystick },
 };
 
 static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *effect)
@@ -75,7 +78,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef
                report->field[0]->value[2] = x;
                report->field[0]->value[3] = y;
                dbg("(x, y)=(%04x, %04x)", x, y);
-               hid_submit_report(hid, report, USB_DIR_OUT);
+               usbhid_submit_report(hid, report, USB_DIR_OUT);
                break;
 
        case FF_RUMBLE:
@@ -90,7 +93,7 @@ static int hid_lgff_play(struct input_dev *dev, void *data, struct ff_effect *ef
                report->field[0]->value[2] = left;
                report->field[0]->value[3] = right;
                dbg("(left, right)=(%04x, %04x)", left, right);
-               hid_submit_report(hid, report, USB_DIR_OUT);
+               usbhid_submit_report(hid, report, USB_DIR_OUT);
                break;
        }
        return 0;
@@ -103,8 +106,9 @@ int hid_lgff_init(struct hid_device* hid)
        struct input_dev *dev = hidinput->input;
        struct hid_report *report;
        struct hid_field *field;
+       const signed short *ff_bits = ff_joystick;
        int error;
-       int i, j;
+       int i;
 
        /* Find the report to use */
        if (list_empty(report_list)) {
@@ -128,12 +132,14 @@ int hid_lgff_init(struct hid_device* hid)
        for (i = 0; i < ARRAY_SIZE(devices); i++) {
                if (dev->id.vendor == devices[i].idVendor &&
                    dev->id.product == devices[i].idProduct) {
-                       for (j = 0; devices[i].ff[j] >= 0; j++)
-                               set_bit(devices[i].ff[j], dev->ffbit);
+                       ff_bits = devices[i].ff;
                        break;
                }
        }
 
+       for (i = 0; ff_bits[i] >= 0; i++)
+               set_bit(ff_bits[i], dev->ffbit);
+
        error = input_ff_create_memless(dev, NULL, hid_lgff_play);
        if (error)
                return error;