vserver 1.9.3

[linux-2.6.git] / drivers / usb / input / aiptek.c

diff --git a/drivers/usb/input/aiptek.c b/drivers/usb/input/aiptek.c
index 81caa0d..44b8fae 100644 (file)
--- a/drivers/usb/input/aiptek.c
+++ b/drivers/usb/input/aiptek.c
@@ -494,9 +494,9 @@ static void aiptek_irq(struct urb *urb, struct pt_regs *regs)
                } else {
                        input_regs(inputdev, regs);
 
-                       x = le16_to_cpu(get_unaligned((__u16 *) (data + 1)));
-                       y = le16_to_cpu(get_unaligned((__u16 *) (data + 3)));
-                       z = le16_to_cpu(get_unaligned((__u16 *) (data + 6)));
+                       x = le16_to_cpu(get_unaligned((__le16 *) (data + 1)));
+                       y = le16_to_cpu(get_unaligned((__le16 *) (data + 3)));
+                       z = le16_to_cpu(get_unaligned((__le16 *) (data + 6)));
 
                        p = (data[5] & 0x01) != 0 ? 1 : 0;
                        dv = (data[5] & 0x02) != 0 ? 1 : 0;
@@ -573,8 +573,8 @@ static void aiptek_irq(struct urb *urb, struct pt_regs *regs)
                        aiptek->diagnostic = AIPTEK_DIAGNOSTIC_TOOL_DISALLOWED;
                } else {
                        input_regs(inputdev, regs);
-                       x = le16_to_cpu(get_unaligned((__u16 *) (data + 1)));
-                       y = le16_to_cpu(get_unaligned((__u16 *) (data + 3)));
+                       x = le16_to_cpu(get_unaligned((__le16 *) (data + 1)));
+                       y = le16_to_cpu(get_unaligned((__le16 *) (data + 3)));
 
                        jitterable = data[5] & 0x1c;
 
@@ -632,7 +632,7 @@ static void aiptek_irq(struct urb *urb, struct pt_regs *regs)
                pck = (data[1] & aiptek->curSetting.stylusButtonUpper) != 0 ? 1 : 0;
 
                macro = data[3];
-               z = le16_to_cpu(get_unaligned((__u16 *) (data + 4)));
+               z = le16_to_cpu(get_unaligned((__le16 *) (data + 4)));
 
                if (dv != 0) {
                        input_regs(inputdev, regs);
@@ -729,7 +729,7 @@ static void aiptek_irq(struct urb *urb, struct pt_regs *regs)
         * hat switches (which just so happen to be the macroKeys.)
         */
        else if (data[0] == 6) {
-               macro = le16_to_cpu(get_unaligned((__u16 *) (data + 1)));
+               macro = le16_to_cpu(get_unaligned((__le16 *) (data + 1)));
                input_regs(inputdev, regs);
 
                if (macro > 0) {
@@ -930,7 +930,7 @@ aiptek_query(struct aiptek *aiptek, unsigned char command, unsigned char data)
                    buf[0], buf[1], buf[2]);
                ret = -EIO;
        } else {
-               ret = le16_to_cpu(get_unaligned((__u16 *) (buf + 1)));
+               ret = le16_to_cpu(get_unaligned((__le16 *) (buf + 1)));
        }
        kfree(buf);
        return ret;
@@ -1324,7 +1324,7 @@ store_tabletXtilt(struct device *dev, const char *buf, size_t count)
        if (strcmp(buf, "disable") == 0) {
                aiptek->newSetting.xTilt = AIPTEK_TILT_DISABLE;
        } else {
-               x = (int)simple_strtol(buf, 0, 10);
+               x = (int)simple_strtol(buf, NULL, 10);
                if (x >= AIPTEK_TILT_MIN && x <= AIPTEK_TILT_MAX) {
                        aiptek->newSetting.xTilt = x;
                }
@@ -1366,7 +1366,7 @@ store_tabletYtilt(struct device *dev, const char *buf, size_t count)
        if (strcmp(buf, "disable") == 0) {
                aiptek->newSetting.yTilt = AIPTEK_TILT_DISABLE;
        } else {
-               y = (int)simple_strtol(buf, 0, 10);
+               y = (int)simple_strtol(buf, NULL, 10);
                if (y >= AIPTEK_TILT_MIN && y <= AIPTEK_TILT_MAX) {
                        aiptek->newSetting.yTilt = y;
                }
@@ -1399,7 +1399,7 @@ store_tabletJitterDelay(struct device *dev, const char *buf, size_t count)
        if (aiptek == NULL)
                return 0;
 
-       aiptek->newSetting.jitterDelay = (int)simple_strtol(buf, 0, 10);
+       aiptek->newSetting.jitterDelay = (int)simple_strtol(buf, NULL, 10);
        return count;
 }
 
@@ -1430,7 +1430,7 @@ store_tabletProgrammableDelay(struct device *dev, const char *buf, size_t count)
        if (aiptek == NULL)
                return 0;
 
-       aiptek->newSetting.programmableDelay = (int)simple_strtol(buf, 0, 10);
+       aiptek->newSetting.programmableDelay = (int)simple_strtol(buf, NULL, 10);
        return count;
 }
 
@@ -1805,7 +1805,7 @@ store_tabletWheel(struct device *dev, const char *buf, size_t count)
        if (aiptek == NULL)
                return 0;
 
-       aiptek->newSetting.wheel = (int)simple_strtol(buf, 0, 10);
+       aiptek->newSetting.wheel = (int)simple_strtol(buf, NULL, 10);
        return count;
 }
 
@@ -2289,9 +2289,9 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 
-MODULE_PARM(programmableDelay, "i");
+module_param(programmableDelay, int, 0);
 MODULE_PARM_DESC(programmableDelay, "delay used during tablet programming");
-MODULE_PARM(jitterDelay, "i");
+module_param(jitterDelay, int, 0);
 MODULE_PARM_DESC(jitterDelay, "stylus/mouse settlement delay");
 
 module_init(aiptek_init);