patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / input / joystick / warrior.c

diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index 426ce2d..32ec90e 100644 (file)
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -11,18 +11,18 @@
 /*
  * This program is free warftware; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or 
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- * 
+ *
  *  Should you need to contact me, the author, you can do so either by
  * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail:
  * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
@@ -44,7 +44,7 @@ MODULE_LICENSE("GPL");
  */
 
 #define WARRIOR_MAX_LENGTH     16
-static char warrior_lengths[] = { 0, 4, 12, 3, 4, 4, 0, 0 }; 
+static char warrior_lengths[] = { 0, 4, 12, 3, 4, 4, 0, 0 };
 static char *warrior_name = "Logitech WingMan Warrior";
 
 /*
@@ -114,7 +114,7 @@ static irqreturn_t warrior_interrupt(struct serio *serio,
                warrior->data[warrior->idx++] = data;
 
        if (warrior->idx == warrior->len) {
-               if (warrior->idx) warrior_process_packet(warrior, regs);        
+               if (warrior->idx) warrior_process_packet(warrior, regs);
                warrior->idx = 0;
                warrior->len = 0;
        }
@@ -152,7 +152,7 @@ static void warrior_connect(struct serio *serio, struct serio_dev *dev)
 
        memset(warrior, 0, sizeof(struct warrior));
 
-       warrior->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS);        
+       warrior->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS);
        warrior->dev.keybit[LONG(BTN_TRIGGER)] = BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_TOP2);
        warrior->dev.relbit[0] = BIT(REL_DIAL);
        warrior->dev.absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_THROTTLE) | BIT(ABS_HAT0X) | BIT(ABS_HAT0Y);
@@ -168,24 +168,24 @@ static void warrior_connect(struct serio *serio, struct serio_dev *dev)
        warrior->dev.id.version = 0x0100;
 
        for (i = 0; i < 2; i++) {
-               warrior->dev.absmax[ABS_X+i] = -64;     
-               warrior->dev.absmin[ABS_X+i] =  64;     
-               warrior->dev.absflat[ABS_X+i] = 8;      
+               warrior->dev.absmax[ABS_X+i] = -64;
+               warrior->dev.absmin[ABS_X+i] =  64;
+               warrior->dev.absflat[ABS_X+i] = 8;
        }
 
-       warrior->dev.absmax[ABS_THROTTLE] = -112;       
-       warrior->dev.absmin[ABS_THROTTLE] =  112;       
+       warrior->dev.absmax[ABS_THROTTLE] = -112;
+       warrior->dev.absmin[ABS_THROTTLE] =  112;
 
        for (i = 0; i < 2; i++) {
-               warrior->dev.absmax[ABS_HAT0X+i] = -1;  
-               warrior->dev.absmin[ABS_HAT0X+i] =  1;  
+               warrior->dev.absmax[ABS_HAT0X+i] = -1;
+               warrior->dev.absmin[ABS_HAT0X+i] =  1;
        }
 
        warrior->dev.private = warrior;
-       
+
        serio->private = warrior;
 
-       if (serio_open(serio, dev)) { 
+       if (serio_open(serio, dev)) {
                kfree(warrior);
                return;
        }