Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: whitespace fixes in drivers/input/mouse

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

+36 -38
+9 -11
drivers/input/mouse/alps.c
··· 61 61 62 62 /* 63 63 * ALPS abolute Mode - new format 64 - * 65 - * byte 0: 1 ? ? ? 1 ? ? ? 64 + * 65 + * byte 0: 1 ? ? ? 1 ? ? ? 66 66 * byte 1: 0 x6 x5 x4 x3 x2 x1 x0 67 67 * byte 2: 0 x10 x9 x8 x7 ? fin ges 68 - * byte 3: 0 y9 y8 y7 1 M R L 68 + * byte 3: 0 y9 y8 y7 1 M R L 69 69 * byte 4: 0 y6 y5 y4 y3 y2 y1 y0 70 70 * byte 5: 0 z6 z5 z4 z3 z2 z1 z0 71 71 * ··· 85 85 input_regs(dev, regs); 86 86 87 87 if ((packet[0] & 0xc8) == 0x08) { /* 3-byte PS/2 packet */ 88 - input_report_key(dev2, BTN_LEFT, packet[0] & 1); 88 + input_report_key(dev2, BTN_LEFT, packet[0] & 1); 89 89 input_report_key(dev2, BTN_RIGHT, packet[0] & 2); 90 90 input_report_key(dev2, BTN_MIDDLE, packet[0] & 4); 91 91 input_report_rel(dev2, REL_X, ··· 436 436 priv->dev2.id.bustype = BUS_I8042; 437 437 priv->dev2.id.vendor = 0x0002; 438 438 priv->dev2.id.product = PSMOUSE_ALPS; 439 - priv->dev2.id.version = 0x0000; 440 - 439 + priv->dev2.id.version = 0x0000; 440 + 441 441 priv->dev2.evbit[0] = BIT(EV_KEY) | BIT(EV_REL); 442 442 priv->dev2.relbit[LONG(REL_X)] |= BIT(REL_X) | BIT(REL_Y); 443 443 priv->dev2.keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT); ··· 461 461 int alps_detect(struct psmouse *psmouse, int set_properties) 462 462 { 463 463 int version; 464 - struct alps_model_info *model; 464 + struct alps_model_info *model; 465 465 466 466 if (!(model = alps_get_model(psmouse, &version))) 467 467 return -1; 468 468 469 469 if (set_properties) { 470 470 psmouse->vendor = "ALPS"; 471 - if (model->flags & ALPS_DUALPOINT) 472 - psmouse->name = "DualPoint TouchPad"; 473 - else 474 - psmouse->name = "GlidePoint"; 471 + psmouse->name = model->flags & ALPS_DUALPOINT ? 472 + "DualPoint TouchPad" : "GlidePoint"; 475 473 psmouse->model = version; 476 474 } 477 475 return 0;
+9 -9
drivers/input/mouse/inport.c
··· 17 17 /* 18 18 * This program is free software; you can redistribute it and/or modify 19 19 * it under the terms of the GNU General Public License as published by 20 - * the Free Software Foundation; either version 2 of the License, or 20 + * the Free Software Foundation; either version 2 of the License, or 21 21 * (at your option) any later version. 22 - * 22 + * 23 23 * This program is distributed in the hope that it will be useful, 24 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 25 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 26 * GNU General Public License for more details. 27 - * 27 + * 28 28 * You should have received a copy of the GNU General Public License 29 29 * along with this program; if not, write to the Free Software 30 30 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 31 - * 31 + * 32 32 * Should you need to contact me, the author, you can do so either by 33 33 * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail: 34 34 * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic ··· 120 120 .close = inport_close, 121 121 .name = INPORT_NAME, 122 122 .phys = "isa023c/input0", 123 - .id = { 124 - .bustype = BUS_ISA, 125 - .vendor = INPORT_VENDOR, 126 - .product = 0x0001, 127 - .version = 0x0100, 123 + .id = { 124 + .bustype = BUS_ISA, 125 + .vendor = INPORT_VENDOR, 126 + .product = 0x0001, 127 + .version = 0x0100, 128 128 }, 129 129 }; 130 130
+5 -5
drivers/input/mouse/logibm.c
··· 18 18 /* 19 19 * This program is free software; you can redistribute it and/or modify 20 20 * it under the terms of the GNU General Public License as published by 21 - * the Free Software Foundation; either version 2 of the License, or 21 + * the Free Software Foundation; either version 2 of the License, or 22 22 * (at your option) any later version. 23 - * 23 + * 24 24 * This program is distributed in the hope that it will be useful, 25 25 * but WITHOUT ANY WARRANTY; without even the implied warranty of 26 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 27 27 * GNU General Public License for more details. 28 - * 28 + * 29 29 * You should have received a copy of the GNU General Public License 30 30 * along with this program; if not, write to the Free Software 31 31 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 32 - * 32 + * 33 33 * Should you need to contact me, the author, you can do so either by 34 34 * e-mail - mail your message to <vojtech@ucw.cz>, or by paper mail: 35 35 * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic ··· 167 167 outb(LOGIBM_DISABLE_IRQ, LOGIBM_CONTROL_PORT); 168 168 169 169 input_register_device(&logibm_dev); 170 - 170 + 171 171 printk(KERN_INFO "input: Logitech bus mouse at %#x irq %d\n", LOGIBM_BASE, logibm_irq); 172 172 173 173 return 0;
+2 -2
drivers/input/mouse/maplemouse.c
··· 1 1 /* 2 2 * $Id: maplemouse.c,v 1.2 2004/03/22 01:18:15 lethal Exp $ 3 - * SEGA Dreamcast mouse driver 3 + * SEGA Dreamcast mouse driver 4 4 * Based on drivers/usb/usbmouse.c 5 5 */ 6 6 ··· 83 83 84 84 mouse->dev.name = dev->product_name; 85 85 mouse->dev.id.bustype = BUS_MAPLE; 86 - 86 + 87 87 input_register_device(&mouse->dev); 88 88 89 89 maple_getcond_callback(dev, dc_mouse_callback, 1, MAPLE_FUNC_MOUSE);
+7 -7
drivers/input/mouse/pc110pad.c
··· 4 4 * Copyright (c) 2000-2001 Vojtech Pavlik 5 5 * 6 6 * Based on the work of: 7 - * Alan Cox Robin O'Leary 7 + * Alan Cox Robin O'Leary 8 8 */ 9 9 10 10 /* ··· 74 74 75 75 if (pc110pad_count < 3) 76 76 return IRQ_HANDLED; 77 - 77 + 78 78 input_regs(&pc110pad_dev, regs); 79 79 input_report_key(&pc110pad_dev, BTN_TOUCH, 80 80 pc110pad_data[0] & 0x01); ··· 145 145 146 146 pc110pad_dev.absmax[ABS_X] = 0x1ff; 147 147 pc110pad_dev.absmax[ABS_Y] = 0x0ff; 148 - 148 + 149 149 pc110pad_dev.open = pc110pad_open; 150 150 pc110pad_dev.close = pc110pad_close; 151 151 ··· 156 156 pc110pad_dev.id.product = 0x0001; 157 157 pc110pad_dev.id.version = 0x0100; 158 158 159 - input_register_device(&pc110pad_dev); 159 + input_register_device(&pc110pad_dev); 160 160 161 161 printk(KERN_INFO "input: %s at %#x irq %d\n", 162 162 pc110pad_name, pc110pad_io, pc110pad_irq); 163 - 163 + 164 164 return 0; 165 165 } 166 - 166 + 167 167 static void __exit pc110pad_exit(void) 168 168 { 169 - input_unregister_device(&pc110pad_dev); 169 + input_unregister_device(&pc110pad_dev); 170 170 171 171 outb(PC110PAD_OFF, pc110pad_io + 2); 172 172
+1 -1
drivers/input/mouse/psmouse.h
··· 99 99 { \ 100 100 return psmouse_attr_set_helper(d, b, s, psmouse_attr_set_##_name); \ 101 101 } \ 102 - static struct device_attribute psmouse_attr_##_name = \ 102 + static struct device_attribute psmouse_attr_##_name = \ 103 103 __ATTR(_name, S_IWUSR | S_IRUGO, \ 104 104 psmouse_do_show_##_name, psmouse_do_set_##_name); 105 105
+1 -1
drivers/input/mouse/rpcmouse.c
··· 59 59 b = (short) (__raw_readl(0xe0310000) ^ 0x70); 60 60 61 61 dx = x - rpcmouse_lastx; 62 - dy = y - rpcmouse_lasty; 62 + dy = y - rpcmouse_lasty; 63 63 64 64 rpcmouse_lastx = x; 65 65 rpcmouse_lasty = y;
+2 -2
drivers/input/mouse/vsxxxaa.c
··· 1 1 /* 2 2 * Driver for DEC VSXXX-AA mouse (hockey-puck mouse, ball or two rollers) 3 - * DEC VSXXX-GA mouse (rectangular mouse, with ball) 4 - * DEC VSXXX-AB tablet (digitizer with hair cross or stylus) 3 + * DEC VSXXX-GA mouse (rectangular mouse, with ball) 4 + * DEC VSXXX-AB tablet (digitizer with hair cross or stylus) 5 5 * 6 6 * Copyright (C) 2003-2004 by Jan-Benedict Glaw <jbglaw@lug-owl.de> 7 7 *