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/keyboard

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

+22 -22
+3 -3
drivers/input/keyboard/atkbd.c
··· 227 227 { \ 228 228 return atkbd_attr_set_helper(d, b, s, atkbd_set_##_name); \ 229 229 } \ 230 - static struct device_attribute atkbd_attr_##_name = \ 230 + static struct device_attribute atkbd_attr_##_name = \ 231 231 __ATTR(_name, S_IWUSR | S_IRUGO, atkbd_do_show_##_name, atkbd_do_set_##_name); 232 232 233 233 ATKBD_DEFINE_ATTR(extra); ··· 388 388 value = atkbd->release ? 0 : 389 389 (1 + (!atkbd->softrepeat && test_bit(atkbd->keycode[code], atkbd->dev.key))); 390 390 391 - switch (value) { /* Workaround Toshiba laptop multiple keypress */ 391 + switch (value) { /* Workaround Toshiba laptop multiple keypress */ 392 392 case 0: 393 393 atkbd->last = 0; 394 394 break; ··· 894 894 if (atkbd->write) { 895 895 param[0] = (test_bit(LED_SCROLLL, atkbd->dev.led) ? 1 : 0) 896 896 | (test_bit(LED_NUML, atkbd->dev.led) ? 2 : 0) 897 - | (test_bit(LED_CAPSL, atkbd->dev.led) ? 4 : 0); 897 + | (test_bit(LED_CAPSL, atkbd->dev.led) ? 4 : 0); 898 898 899 899 if (atkbd_probe(atkbd)) 900 900 return -1;
+4 -4
drivers/input/keyboard/lkkbd.c
··· 15 15 * information given below, I will _not_ be liable! 16 16 * 17 17 * RJ10 pinout: To DE9: Or DB25: 18 - * 1 - RxD <----> Pin 3 (TxD) <-> Pin 2 (TxD) 19 - * 2 - GND <----> Pin 5 (GND) <-> Pin 7 (GND) 20 - * 4 - TxD <----> Pin 2 (RxD) <-> Pin 3 (RxD) 21 - * 3 - +12V (from HDD drive connector), DON'T connect to DE9 or DB25!!! 18 + * 1 - RxD <----> Pin 3 (TxD) <-> Pin 2 (TxD) 19 + * 2 - GND <----> Pin 5 (GND) <-> Pin 7 (GND) 20 + * 4 - TxD <----> Pin 2 (RxD) <-> Pin 3 (RxD) 21 + * 3 - +12V (from HDD drive connector), DON'T connect to DE9 or DB25!!! 22 22 * 23 23 * Pin numbers for DE9 and DB25 are noted on the plug (quite small:). For 24 24 * RJ10, it's like this:
+14 -14
drivers/input/keyboard/locomokbd.c
··· 42 42 MODULE_DESCRIPTION("LoCoMo keyboard driver"); 43 43 MODULE_LICENSE("GPL"); 44 44 45 - #define LOCOMOKBD_NUMKEYS 128 45 + #define LOCOMOKBD_NUMKEYS 128 46 46 47 47 #define KEY_ACTIVITY KEY_F16 48 48 #define KEY_CONTACT KEY_F18 ··· 61 61 KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */ 62 62 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */ 63 63 KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */ 64 - KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ 64 + KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */ 65 65 }; 66 66 67 67 #define KB_ROWS 16 ··· 82 82 struct locomo_dev *ldev; 83 83 unsigned long base; 84 84 spinlock_t lock; 85 - 85 + 86 86 struct timer_list timer; 87 87 }; 88 88 ··· 95 95 static inline void locomokbd_activate_all(unsigned long membase) 96 96 { 97 97 unsigned long r; 98 - 98 + 99 99 locomo_writel(0, membase + LOCOMO_KSC); 100 100 r = locomo_readl(membase + LOCOMO_KIC); 101 101 r &= 0xFEFF; ··· 127 127 */ 128 128 129 129 /* Scan the hardware keyboard and push any changes up through the input layer */ 130 - static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *regs) 130 + static void locomokbd_scankeyboard(struct locomokbd *locomokbd, struct pt_regs *regs) 131 131 { 132 132 unsigned int row, col, rowd, scancode; 133 133 unsigned long flags; ··· 138 138 139 139 if (regs) 140 140 input_regs(&locomokbd->input, regs); 141 - 141 + 142 142 locomokbd_charge_all(membase); 143 143 144 144 num_pressed = 0; ··· 146 146 147 147 locomokbd_activate_col(membase, col); 148 148 udelay(KB_DELAY); 149 - 149 + 150 150 rowd = ~locomo_readl(membase + LOCOMO_KIB); 151 - for (row = 0; row < KB_ROWS; row++ ) { 151 + for (row = 0; row < KB_ROWS; row++) { 152 152 scancode = SCANCODE(col, row); 153 153 if (rowd & KB_ROWMASK(row)) { 154 154 num_pressed += 1; ··· 170 170 spin_unlock_irqrestore(&locomokbd->lock, flags); 171 171 } 172 172 173 - /* 173 + /* 174 174 * LoCoMo keyboard interrupt handler. 175 175 */ 176 176 static irqreturn_t locomokbd_interrupt(int irq, void *dev_id, struct pt_regs *regs) ··· 205 205 memset(locomokbd, 0, sizeof(struct locomokbd)); 206 206 207 207 /* try and claim memory region */ 208 - if (!request_mem_region((unsigned long) dev->mapbase, 209 - dev->length, 208 + if (!request_mem_region((unsigned long) dev->mapbase, 209 + dev->length, 210 210 LOCOMO_DRIVER_NAME(dev))) { 211 211 ret = -EBUSY; 212 212 printk(KERN_ERR "locomokbd: Can't acquire access to io memory for keyboard\n"); ··· 225 225 locomokbd->timer.data = (unsigned long) locomokbd; 226 226 227 227 locomokbd->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP); 228 - 228 + 229 229 init_input_dev(&locomokbd->input); 230 230 locomokbd->input.keycode = locomokbd->keycode; 231 231 locomokbd->input.keycodesize = sizeof(unsigned char); ··· 271 271 static int locomokbd_remove(struct locomo_dev *dev) 272 272 { 273 273 struct locomokbd *locomokbd = locomo_get_drvdata(dev); 274 - 274 + 275 275 free_irq(dev->irq[0], locomokbd); 276 276 277 277 del_timer_sync(&locomokbd->timer); 278 - 278 + 279 279 input_unregister_device(&locomokbd->input); 280 280 locomo_set_drvdata(dev, NULL); 281 281
+1 -1
drivers/input/keyboard/maple_keyb.c
··· 1 1 /* 2 2 * $Id: maple_keyb.c,v 1.4 2004/03/22 01:18:15 lethal Exp $ 3 - * SEGA Dreamcast keyboard driver 3 + * SEGA Dreamcast keyboard driver 4 4 * Based on drivers/usb/usbkbd.c 5 5 */ 6 6