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

Input: lkkbd - change formatting style to match the rest of the kernel

- no spaces between function name and opening parenthesis
- switch statements were indented too much

This makes checkpatch (and me) happy.

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

+226 -246
+226 -246
drivers/input/keyboard/lkkbd.c
··· 72 72 73 73 #define DRIVER_DESC "LK keyboard driver" 74 74 75 - MODULE_AUTHOR ("Jan-Benedict Glaw <jbglaw@lug-owl.de>"); 76 - MODULE_DESCRIPTION (DRIVER_DESC); 77 - MODULE_LICENSE ("GPL"); 75 + MODULE_AUTHOR("Jan-Benedict Glaw <jbglaw@lug-owl.de>"); 76 + MODULE_DESCRIPTION(DRIVER_DESC); 77 + MODULE_LICENSE("GPL"); 78 78 79 79 /* 80 80 * Known parameters: ··· 85 85 * Please notice that there's not yet an API to set these at runtime. 86 86 */ 87 87 static int bell_volume = 100; /* % */ 88 - module_param (bell_volume, int, 0); 89 - MODULE_PARM_DESC (bell_volume, "Bell volume (in %). default is 100%"); 88 + module_param(bell_volume, int, 0); 89 + MODULE_PARM_DESC(bell_volume, "Bell volume (in %). default is 100%"); 90 90 91 91 static int keyclick_volume = 100; /* % */ 92 - module_param (keyclick_volume, int, 0); 93 - MODULE_PARM_DESC (keyclick_volume, "Keyclick volume (in %), default is 100%"); 92 + module_param(keyclick_volume, int, 0); 93 + MODULE_PARM_DESC(keyclick_volume, "Keyclick volume (in %), default is 100%"); 94 94 95 95 static int ctrlclick_volume = 100; /* % */ 96 - module_param (ctrlclick_volume, int, 0); 97 - MODULE_PARM_DESC (ctrlclick_volume, "Ctrlclick volume (in %), default is 100%"); 96 + module_param(ctrlclick_volume, int, 0); 97 + MODULE_PARM_DESC(ctrlclick_volume, "Ctrlclick volume (in %), default is 100%"); 98 98 99 99 static int lk201_compose_is_alt; 100 - module_param (lk201_compose_is_alt, int, 0); 101 - MODULE_PARM_DESC (lk201_compose_is_alt, "If set non-zero, LK201' Compose key " 102 - "will act as an Alt key"); 100 + module_param(lk201_compose_is_alt, int, 0); 101 + MODULE_PARM_DESC(lk201_compose_is_alt, 102 + "If set non-zero, LK201' Compose key will act as an Alt key"); 103 103 104 104 105 105 106 106 #undef LKKBD_DEBUG 107 107 #ifdef LKKBD_DEBUG 108 - #define DBG(x...) printk (x) 108 + #define DBG(x...) printk(x) 109 109 #else 110 110 #define DBG(x...) do {} while (0) 111 111 #endif ··· 122 122 #define LK_MODE_DOWN 0x80 123 123 #define LK_MODE_AUTODOWN 0x82 124 124 #define LK_MODE_UPDOWN 0x86 125 - #define LK_CMD_SET_MODE(mode,div) ((mode) | ((div) << 3)) 125 + #define LK_CMD_SET_MODE(mode, div) ((mode) | ((div) << 3)) 126 126 127 127 /* Misc commands */ 128 128 #define LK_CMD_ENABLE_KEYCLICK 0x1b ··· 152 152 153 153 #define LK_NUM_KEYCODES 256 154 154 #define LK_NUM_IGNORE_BYTES 6 155 - typedef u_int16_t lk_keycode_t; 156 155 157 - 158 - 159 - static lk_keycode_t lkkbd_keycode[LK_NUM_KEYCODES] = { 156 + static unsigned short lkkbd_keycode[LK_NUM_KEYCODES] = { 160 157 [0x56] = KEY_F1, 161 158 [0x57] = KEY_F2, 162 159 [0x58] = KEY_F3, ··· 265 268 }; 266 269 267 270 #define CHECK_LED(LK, VAR_ON, VAR_OFF, LED, BITS) do { \ 268 - if (test_bit (LED, (LK)->dev->led)) \ 271 + if (test_bit(LED, (LK)->dev->led)) \ 269 272 VAR_ON |= BITS; \ 270 273 else \ 271 274 VAR_OFF |= BITS; \ ··· 275 278 * Per-keyboard data 276 279 */ 277 280 struct lkkbd { 278 - lk_keycode_t keycode[LK_NUM_KEYCODES]; 281 + unsigned short keycode[LK_NUM_KEYCODES]; 279 282 int ignore_bytes; 280 283 unsigned char id[LK_NUM_IGNORE_BYTES]; 281 284 struct input_dev *dev; ··· 298 301 unsigned char *name; 299 302 } lk_response[] = { 300 303 #define RESPONSE(x) { .value = (x), .name = #x, } 301 - RESPONSE (LK_STUCK_KEY), 302 - RESPONSE (LK_SELFTEST_FAILED), 303 - RESPONSE (LK_ALL_KEYS_UP), 304 - RESPONSE (LK_METRONOME), 305 - RESPONSE (LK_OUTPUT_ERROR), 306 - RESPONSE (LK_INPUT_ERROR), 307 - RESPONSE (LK_KBD_LOCKED), 308 - RESPONSE (LK_KBD_TEST_MODE_ACK), 309 - RESPONSE (LK_PREFIX_KEY_DOWN), 310 - RESPONSE (LK_MODE_CHANGE_ACK), 311 - RESPONSE (LK_RESPONSE_RESERVED), 304 + RESPONSE(LK_STUCK_KEY), 305 + RESPONSE(LK_SELFTEST_FAILED), 306 + RESPONSE(LK_ALL_KEYS_UP), 307 + RESPONSE(LK_METRONOME), 308 + RESPONSE(LK_OUTPUT_ERROR), 309 + RESPONSE(LK_INPUT_ERROR), 310 + RESPONSE(LK_KBD_LOCKED), 311 + RESPONSE(LK_KBD_TEST_MODE_ACK), 312 + RESPONSE(LK_PREFIX_KEY_DOWN), 313 + RESPONSE(LK_MODE_CHANGE_ACK), 314 + RESPONSE(LK_RESPONSE_RESERVED), 312 315 #undef RESPONSE 313 316 }; 314 317 315 - static unsigned char * 316 - response_name (unsigned char value) 318 + static unsigned char *response_name(unsigned char value) 317 319 { 318 320 int i; 319 321 320 - for (i = 0; i < ARRAY_SIZE (lk_response); i++) 322 + for (i = 0; i < ARRAY_SIZE(lk_response); i++) 321 323 if (lk_response[i].value == value) 322 324 return lk_response[i].name; 323 325 ··· 327 331 /* 328 332 * Calculate volume parameter byte for a given volume. 329 333 */ 330 - static unsigned char 331 - volume_to_hw (int volume_percent) 334 + static unsigned char volume_to_hw(int volume_percent) 332 335 { 333 336 unsigned char ret = 0; 334 337 ··· 358 363 return ret; 359 364 } 360 365 361 - static void 362 - lkkbd_detection_done (struct lkkbd *lk) 366 + static void lkkbd_detection_done(struct lkkbd *lk) 363 367 { 364 368 int i; 365 369 ··· 371 377 * Print keyboard name and modify Compose=Alt on user's request. 372 378 */ 373 379 switch (lk->id[4]) { 374 - case 1: 375 - strlcpy (lk->name, "DEC LK201 keyboard", 376 - sizeof (lk->name)); 380 + case 1: 381 + strlcpy(lk->name, "DEC LK201 keyboard", sizeof(lk->name)); 377 382 378 - if (lk201_compose_is_alt) 379 - lk->keycode[0xb1] = KEY_LEFTALT; 380 - break; 383 + if (lk201_compose_is_alt) 384 + lk->keycode[0xb1] = KEY_LEFTALT; 385 + break; 381 386 382 - case 2: 383 - strlcpy (lk->name, "DEC LK401 keyboard", 384 - sizeof (lk->name)); 385 - break; 387 + case 2: 388 + strlcpy(lk->name, "DEC LK401 keyboard", sizeof(lk->name)); 389 + break; 386 390 387 - default: 388 - strlcpy (lk->name, "Unknown DEC keyboard", 389 - sizeof (lk->name)); 390 - printk (KERN_ERR "lkkbd: keyboard on %s is unknown, " 391 - "please report to Jan-Benedict Glaw " 392 - "<jbglaw@lug-owl.de>\n", lk->phys); 393 - printk (KERN_ERR "lkkbd: keyboard ID'ed as:"); 394 - for (i = 0; i < LK_NUM_IGNORE_BYTES; i++) 395 - printk (" 0x%02x", lk->id[i]); 396 - printk ("\n"); 397 - break; 391 + default: 392 + strlcpy(lk->name, "Unknown DEC keyboard", sizeof(lk->name)); 393 + printk(KERN_ERR 394 + "lkkbd: keyboard on %s is unknown, please report to " 395 + "Jan-Benedict Glaw <jbglaw@lug-owl.de>\n", lk->phys); 396 + printk(KERN_ERR "lkkbd: keyboard ID'ed as:"); 397 + for (i = 0; i < LK_NUM_IGNORE_BYTES; i++) 398 + printk(" 0x%02x", lk->id[i]); 399 + printk("\n"); 400 + break; 398 401 } 399 - printk (KERN_INFO "lkkbd: keyboard on %s identified as: %s\n", 400 - lk->phys, lk->name); 402 + 403 + printk(KERN_INFO "lkkbd: keyboard on %s identified as: %s\n", 404 + lk->phys, lk->name); 401 405 402 406 /* 403 407 * Report errors during keyboard boot-up. 404 408 */ 405 409 switch (lk->id[2]) { 406 - case 0x00: 407 - /* All okay */ 408 - break; 410 + case 0x00: 411 + /* All okay */ 412 + break; 409 413 410 - case LK_STUCK_KEY: 411 - printk (KERN_ERR "lkkbd: Stuck key on keyboard at " 412 - "%s\n", lk->phys); 413 - break; 414 + case LK_STUCK_KEY: 415 + printk(KERN_ERR "lkkbd: Stuck key on keyboard at %s\n", 416 + lk->phys); 417 + break; 414 418 415 - case LK_SELFTEST_FAILED: 416 - printk (KERN_ERR "lkkbd: Selftest failed on keyboard " 417 - "at %s, keyboard may not work " 418 - "properly\n", lk->phys); 419 - break; 419 + case LK_SELFTEST_FAILED: 420 + printk(KERN_ERR 421 + "lkkbd: Selftest failed on keyboard at %s, " 422 + "keyboard may not work properly\n", lk->phys); 423 + break; 420 424 421 - default: 422 - printk (KERN_ERR "lkkbd: Unknown error %02x on " 423 - "keyboard at %s\n", lk->id[2], 424 - lk->phys); 425 - break; 425 + default: 426 + printk(KERN_ERR 427 + "lkkbd: Unknown error %02x on keyboard at %s\n", 428 + lk->id[2], lk->phys); 429 + break; 426 430 } 427 431 428 432 /* 429 433 * Try to hint user if there's a stuck key. 430 434 */ 431 435 if (lk->id[2] == LK_STUCK_KEY && lk->id[3] != 0) 432 - printk (KERN_ERR "Scancode of stuck key is 0x%02x, keycode " 433 - "is 0x%04x\n", lk->id[3], 434 - lk->keycode[lk->id[3]]); 435 - 436 - return; 436 + printk(KERN_ERR 437 + "Scancode of stuck key is 0x%02x, keycode is 0x%04x\n", 438 + lk->id[3], lk->keycode[lk->id[3]]); 437 439 } 438 440 439 441 /* 440 442 * lkkbd_interrupt() is called by the low level driver when a character 441 443 * is received. 442 444 */ 443 - static irqreturn_t 444 - lkkbd_interrupt (struct serio *serio, unsigned char data, unsigned int flags) 445 + static irqreturn_t lkkbd_interrupt(struct serio *serio, 446 + unsigned char data, unsigned int flags) 445 447 { 446 - struct lkkbd *lk = serio_get_drvdata (serio); 448 + struct lkkbd *lk = serio_get_drvdata(serio); 449 + struct input_dev *input_dev = lk->dev; 450 + unsigned int keycode; 447 451 int i; 448 452 449 - DBG (KERN_INFO "Got byte 0x%02x\n", data); 453 + DBG(KERN_INFO "Got byte 0x%02x\n", data); 450 454 451 455 if (lk->ignore_bytes > 0) { 452 - DBG (KERN_INFO "Ignoring a byte on %s\n", lk->name); 456 + DBG(KERN_INFO "Ignoring a byte on %s\n", lk->name); 453 457 lk->id[LK_NUM_IGNORE_BYTES - lk->ignore_bytes--] = data; 454 458 455 459 if (lk->ignore_bytes == 0) 456 - lkkbd_detection_done (lk); 460 + lkkbd_detection_done(lk); 457 461 458 462 return IRQ_HANDLED; 459 463 } 460 464 461 465 switch (data) { 462 - case LK_ALL_KEYS_UP: 463 - for (i = 0; i < ARRAY_SIZE (lkkbd_keycode); i++) 464 - if (lk->keycode[i] != KEY_RESERVED) 465 - input_report_key (lk->dev, lk->keycode[i], 0); 466 - input_sync (lk->dev); 467 - break; 466 + case LK_ALL_KEYS_UP: 467 + for (i = 0; i < ARRAY_SIZE(lkkbd_keycode); i++) 468 + input_report_key(input_dev, lk->keycode[i], 0); 469 + input_sync(input_dev); 470 + break; 468 471 469 - case 0x01: 470 - DBG (KERN_INFO "Got 0x01, scheduling re-initialization\n"); 471 - lk->ignore_bytes = LK_NUM_IGNORE_BYTES; 472 - lk->id[LK_NUM_IGNORE_BYTES - lk->ignore_bytes--] = data; 473 - schedule_work (&lk->tq); 474 - break; 472 + case 0x01: 473 + DBG(KERN_INFO "Got 0x01, scheduling re-initialization\n"); 474 + lk->ignore_bytes = LK_NUM_IGNORE_BYTES; 475 + lk->id[LK_NUM_IGNORE_BYTES - lk->ignore_bytes--] = data; 476 + schedule_work(&lk->tq); 477 + break; 475 478 476 - case LK_METRONOME: 477 - case LK_OUTPUT_ERROR: 478 - case LK_INPUT_ERROR: 479 - case LK_KBD_LOCKED: 480 - case LK_KBD_TEST_MODE_ACK: 481 - case LK_PREFIX_KEY_DOWN: 482 - case LK_MODE_CHANGE_ACK: 483 - case LK_RESPONSE_RESERVED: 484 - DBG (KERN_INFO "Got %s and don't know how to handle...\n", 485 - response_name (data)); 486 - break; 479 + case LK_METRONOME: 480 + case LK_OUTPUT_ERROR: 481 + case LK_INPUT_ERROR: 482 + case LK_KBD_LOCKED: 483 + case LK_KBD_TEST_MODE_ACK: 484 + case LK_PREFIX_KEY_DOWN: 485 + case LK_MODE_CHANGE_ACK: 486 + case LK_RESPONSE_RESERVED: 487 + DBG(KERN_INFO "Got %s and don't know how to handle...\n", 488 + response_name(data)); 489 + break; 487 490 488 - default: 489 - if (lk->keycode[data] != KEY_RESERVED) { 490 - if (!test_bit (lk->keycode[data], lk->dev->key)) 491 - input_report_key (lk->dev, lk->keycode[data], 1); 492 - else 493 - input_report_key (lk->dev, lk->keycode[data], 0); 494 - input_sync (lk->dev); 495 - } else 496 - printk (KERN_WARNING "%s: Unknown key with " 497 - "scancode 0x%02x on %s.\n", 498 - __FILE__, data, lk->name); 491 + default: 492 + keycode = lk->keycode[data]; 493 + if (keycode != KEY_RESERVED) { 494 + input_report_key(input_dev, keycode, 495 + !test_bit(keycode, input_dev->key)); 496 + input_sync(input_dev); 497 + } else { 498 + printk(KERN_WARNING 499 + "%s: Unknown key with scancode 0x%02x on %s.\n", 500 + __FILE__, data, lk->name); 501 + } 499 502 } 500 503 501 504 return IRQ_HANDLED; 502 505 } 503 506 504 - /* 505 - * lkkbd_event() handles events from the input module. 506 - */ 507 - static int 508 - lkkbd_event (struct input_dev *dev, unsigned int type, unsigned int code, 509 - int value) 507 + static void lkkbd_toggle_leds(struct lkkbd *lk) 510 508 { 511 - struct lkkbd *lk = input_get_drvdata (dev); 509 + struct serio *serio = lk->serio; 512 510 unsigned char leds_on = 0; 513 511 unsigned char leds_off = 0; 514 512 513 + CHECK_LED(lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK); 514 + CHECK_LED(lk, leds_on, leds_off, LED_COMPOSE, LK_LED_COMPOSE); 515 + CHECK_LED(lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK); 516 + CHECK_LED(lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT); 517 + if (leds_on != 0) { 518 + serio_write(serio, LK_CMD_LED_ON); 519 + serio_write(serio, leds_on); 520 + } 521 + if (leds_off != 0) { 522 + serio_write(serio, LK_CMD_LED_OFF); 523 + serio_write(serio, leds_off); 524 + } 525 + } 526 + 527 + static void lkkbd_toggle_keyclick(struct lkkbd *lk, bool on) 528 + { 529 + struct serio *serio = lk->serio; 530 + 531 + if (on) { 532 + DBG("%s: Activating key clicks\n", __func__); 533 + serio_write(serio, LK_CMD_ENABLE_KEYCLICK); 534 + serio_write(serio, volume_to_hw(lk->keyclick_volume)); 535 + serio_write(serio, LK_CMD_ENABLE_CTRCLICK); 536 + serio_write(serio, volume_to_hw(lk->ctrlclick_volume)); 537 + } else { 538 + DBG("%s: Deactivating key clicks\n", __func__); 539 + serio_write(serio, LK_CMD_DISABLE_KEYCLICK); 540 + serio_write(serio, LK_CMD_DISABLE_CTRCLICK); 541 + } 542 + 543 + } 544 + 545 + /* 546 + * lkkbd_event() handles events from the input module. 547 + */ 548 + static int lkkbd_event(struct input_dev *dev, 549 + unsigned int type, unsigned int code, int value) 550 + { 551 + struct lkkbd *lk = input_get_drvdata(dev); 552 + 515 553 switch (type) { 516 - case EV_LED: 517 - CHECK_LED (lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK); 518 - CHECK_LED (lk, leds_on, leds_off, LED_COMPOSE, LK_LED_COMPOSE); 519 - CHECK_LED (lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK); 520 - CHECK_LED (lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT); 521 - if (leds_on != 0) { 522 - serio_write (lk->serio, LK_CMD_LED_ON); 523 - serio_write (lk->serio, leds_on); 524 - } 525 - if (leds_off != 0) { 526 - serio_write (lk->serio, LK_CMD_LED_OFF); 527 - serio_write (lk->serio, leds_off); 528 - } 554 + case EV_LED: 555 + lkkbd_toggle_leds(lk); 556 + return 0; 557 + 558 + case EV_SND: 559 + switch (code) { 560 + case SND_CLICK: 561 + lkkbd_toggle_keyclick(lk, value); 529 562 return 0; 530 563 531 - case EV_SND: 532 - switch (code) { 533 - case SND_CLICK: 534 - if (value == 0) { 535 - DBG ("%s: Deactivating key clicks\n", __func__); 536 - serio_write (lk->serio, LK_CMD_DISABLE_KEYCLICK); 537 - serio_write (lk->serio, LK_CMD_DISABLE_CTRCLICK); 538 - } else { 539 - DBG ("%s: Activating key clicks\n", __func__); 540 - serio_write (lk->serio, LK_CMD_ENABLE_KEYCLICK); 541 - serio_write (lk->serio, volume_to_hw (lk->keyclick_volume)); 542 - serio_write (lk->serio, LK_CMD_ENABLE_CTRCLICK); 543 - serio_write (lk->serio, volume_to_hw (lk->ctrlclick_volume)); 544 - } 545 - return 0; 564 + case SND_BELL: 565 + if (value != 0) 566 + serio_write(lk->serio, LK_CMD_SOUND_BELL); 546 567 547 - case SND_BELL: 548 - if (value != 0) 549 - serio_write (lk->serio, LK_CMD_SOUND_BELL); 568 + return 0; 569 + } 550 570 551 - return 0; 552 - } 553 - break; 571 + break; 554 572 555 - default: 556 - printk (KERN_ERR "%s (): Got unknown type %d, code %d, value %d\n", 557 - __func__, type, code, value); 573 + default: 574 + printk(KERN_ERR "%s(): Got unknown type %d, code %d, value %d\n", 575 + __func__, type, code, value); 558 576 } 559 577 560 578 return -1; ··· 576 570 * lkkbd_reinit() sets leds and beeps to a state the computer remembers they 577 571 * were in. 578 572 */ 579 - static void 580 - lkkbd_reinit (struct work_struct *work) 573 + static void lkkbd_reinit(struct work_struct *work) 581 574 { 582 575 struct lkkbd *lk = container_of(work, struct lkkbd, tq); 583 576 int division; 584 - unsigned char leds_on = 0; 585 - unsigned char leds_off = 0; 586 577 587 578 /* Ask for ID */ 588 - serio_write (lk->serio, LK_CMD_REQUEST_ID); 579 + serio_write(lk->serio, LK_CMD_REQUEST_ID); 589 580 590 581 /* Reset parameters */ 591 - serio_write (lk->serio, LK_CMD_SET_DEFAULTS); 582 + serio_write(lk->serio, LK_CMD_SET_DEFAULTS); 592 583 593 584 /* Set LEDs */ 594 - CHECK_LED (lk, leds_on, leds_off, LED_CAPSL, LK_LED_SHIFTLOCK); 595 - CHECK_LED (lk, leds_on, leds_off, LED_COMPOSE, LK_LED_COMPOSE); 596 - CHECK_LED (lk, leds_on, leds_off, LED_SCROLLL, LK_LED_SCROLLLOCK); 597 - CHECK_LED (lk, leds_on, leds_off, LED_SLEEP, LK_LED_WAIT); 598 - if (leds_on != 0) { 599 - serio_write (lk->serio, LK_CMD_LED_ON); 600 - serio_write (lk->serio, leds_on); 601 - } 602 - if (leds_off != 0) { 603 - serio_write (lk->serio, LK_CMD_LED_OFF); 604 - serio_write (lk->serio, leds_off); 605 - } 585 + lkkbd_toggle_leds(lk); 606 586 607 587 /* 608 588 * Try to activate extended LK401 mode. This command will 609 589 * only work with a LK401 keyboard and grants access to 610 590 * LAlt, RAlt, RCompose and RShift. 611 591 */ 612 - serio_write (lk->serio, LK_CMD_ENABLE_LK401); 592 + serio_write(lk->serio, LK_CMD_ENABLE_LK401); 613 593 614 594 /* Set all keys to UPDOWN mode */ 615 595 for (division = 1; division <= 14; division++) 616 - serio_write (lk->serio, LK_CMD_SET_MODE (LK_MODE_UPDOWN, 617 - division)); 596 + serio_write(lk->serio, 597 + LK_CMD_SET_MODE(LK_MODE_UPDOWN, division)); 618 598 619 599 /* Enable bell and set volume */ 620 - serio_write (lk->serio, LK_CMD_ENABLE_BELL); 621 - serio_write (lk->serio, volume_to_hw (lk->bell_volume)); 600 + serio_write(lk->serio, LK_CMD_ENABLE_BELL); 601 + serio_write(lk->serio, volume_to_hw(lk->bell_volume)); 622 602 623 603 /* Enable/disable keyclick (and possibly set volume) */ 624 - if (test_bit (SND_CLICK, lk->dev->snd)) { 625 - serio_write (lk->serio, LK_CMD_ENABLE_KEYCLICK); 626 - serio_write (lk->serio, volume_to_hw (lk->keyclick_volume)); 627 - serio_write (lk->serio, LK_CMD_ENABLE_CTRCLICK); 628 - serio_write (lk->serio, volume_to_hw (lk->ctrlclick_volume)); 629 - } else { 630 - serio_write (lk->serio, LK_CMD_DISABLE_KEYCLICK); 631 - serio_write (lk->serio, LK_CMD_DISABLE_CTRCLICK); 632 - } 604 + lkkbd_toggle_keyclick(lk, test_bit(SND_CLICK, lk->dev->snd)); 633 605 634 606 /* Sound the bell if needed */ 635 - if (test_bit (SND_BELL, lk->dev->snd)) 636 - serio_write (lk->serio, LK_CMD_SOUND_BELL); 607 + if (test_bit(SND_BELL, lk->dev->snd)) 608 + serio_write(lk->serio, LK_CMD_SOUND_BELL); 637 609 } 638 610 639 611 /* 640 612 * lkkbd_connect() probes for a LK keyboard and fills the necessary structures. 641 613 */ 642 - static int 643 - lkkbd_connect (struct serio *serio, struct serio_driver *drv) 614 + static int lkkbd_connect(struct serio *serio, struct serio_driver *drv) 644 615 { 645 616 struct lkkbd *lk; 646 617 struct input_dev *input_dev; 647 618 int i; 648 619 int err; 649 620 650 - lk = kzalloc (sizeof (struct lkkbd), GFP_KERNEL); 651 - input_dev = input_allocate_device (); 621 + lk = kzalloc(sizeof(struct lkkbd), GFP_KERNEL); 622 + input_dev = input_allocate_device(); 652 623 if (!lk || !input_dev) { 653 624 err = -ENOMEM; 654 625 goto fail1; ··· 633 650 634 651 lk->serio = serio; 635 652 lk->dev = input_dev; 636 - INIT_WORK (&lk->tq, lkkbd_reinit); 653 + INIT_WORK(&lk->tq, lkkbd_reinit); 637 654 lk->bell_volume = bell_volume; 638 655 lk->keyclick_volume = keyclick_volume; 639 656 lk->ctrlclick_volume = ctrlclick_volume; 640 - memcpy (lk->keycode, lkkbd_keycode, sizeof (lk_keycode_t) * LK_NUM_KEYCODES); 657 + memcpy(lk->keycode, lkkbd_keycode, sizeof(lk->keycode)); 641 658 642 - strlcpy (lk->name, "DEC LK keyboard", sizeof(lk->name)); 643 - snprintf (lk->phys, sizeof(lk->phys), "%s/input0", serio->phys); 659 + strlcpy(lk->name, "DEC LK keyboard", sizeof(lk->name)); 660 + snprintf(lk->phys, sizeof(lk->phys), "%s/input0", serio->phys); 644 661 645 662 input_dev->name = lk->name; 646 663 input_dev->phys = lk->phys; ··· 651 668 input_dev->dev.parent = &serio->dev; 652 669 input_dev->event = lkkbd_event; 653 670 654 - input_set_drvdata (input_dev, lk); 671 + input_set_drvdata(input_dev, lk); 655 672 656 - set_bit (EV_KEY, input_dev->evbit); 657 - set_bit (EV_LED, input_dev->evbit); 658 - set_bit (EV_SND, input_dev->evbit); 659 - set_bit (EV_REP, input_dev->evbit); 660 - set_bit (LED_CAPSL, input_dev->ledbit); 661 - set_bit (LED_SLEEP, input_dev->ledbit); 662 - set_bit (LED_COMPOSE, input_dev->ledbit); 663 - set_bit (LED_SCROLLL, input_dev->ledbit); 664 - set_bit (SND_BELL, input_dev->sndbit); 665 - set_bit (SND_CLICK, input_dev->sndbit); 673 + __set_bit(EV_KEY, input_dev->evbit); 674 + __set_bit(EV_LED, input_dev->evbit); 675 + __set_bit(EV_SND, input_dev->evbit); 676 + __set_bit(EV_REP, input_dev->evbit); 677 + __set_bit(LED_CAPSL, input_dev->ledbit); 678 + __set_bit(LED_SLEEP, input_dev->ledbit); 679 + __set_bit(LED_COMPOSE, input_dev->ledbit); 680 + __set_bit(LED_SCROLLL, input_dev->ledbit); 681 + __set_bit(SND_BELL, input_dev->sndbit); 682 + __set_bit(SND_CLICK, input_dev->sndbit); 666 683 667 684 input_dev->keycode = lk->keycode; 668 - input_dev->keycodesize = sizeof (lk_keycode_t); 669 - input_dev->keycodemax = LK_NUM_KEYCODES; 685 + input_dev->keycodesize = sizeof(lk->keycode[0]); 686 + input_dev->keycodemax = ARRAY_SIZE(lk->keycode); 670 687 671 688 for (i = 0; i < LK_NUM_KEYCODES; i++) 672 - __set_bit (lk->keycode[i], input_dev->keybit); 689 + __set_bit(lk->keycode[i], input_dev->keybit); 673 690 __clear_bit(KEY_RESERVED, input_dev->keybit); 674 691 675 - serio_set_drvdata (serio, lk); 692 + serio_set_drvdata(serio, lk); 676 693 677 - err = serio_open (serio, drv); 694 + err = serio_open(serio, drv); 678 695 if (err) 679 696 goto fail2; 680 697 681 - err = input_register_device (lk->dev); 698 + err = input_register_device(lk->dev); 682 699 if (err) 683 700 goto fail3; 684 701 685 - serio_write (lk->serio, LK_CMD_POWERCYCLE_RESET); 702 + serio_write(lk->serio, LK_CMD_POWERCYCLE_RESET); 686 703 687 704 return 0; 688 705 689 - fail3: serio_close (serio); 690 - fail2: serio_set_drvdata (serio, NULL); 691 - fail1: input_free_device (input_dev); 692 - kfree (lk); 706 + fail3: serio_close(serio); 707 + fail2: serio_set_drvdata(serio, NULL); 708 + fail1: input_free_device(input_dev); 709 + kfree(lk); 693 710 return err; 694 711 } 695 712 696 713 /* 697 714 * lkkbd_disconnect() unregisters and closes behind us. 698 715 */ 699 - static void 700 - lkkbd_disconnect (struct serio *serio) 716 + static void lkkbd_disconnect(struct serio *serio) 701 717 { 702 - struct lkkbd *lk = serio_get_drvdata (serio); 718 + struct lkkbd *lk = serio_get_drvdata(serio); 703 719 704 - input_get_device (lk->dev); 705 - input_unregister_device (lk->dev); 706 - serio_close (serio); 707 - serio_set_drvdata (serio, NULL); 708 - input_put_device (lk->dev); 709 - kfree (lk); 720 + input_get_device(lk->dev); 721 + input_unregister_device(lk->dev); 722 + serio_close(serio); 723 + serio_set_drvdata(serio, NULL); 724 + input_put_device(lk->dev); 725 + kfree(lk); 710 726 } 711 727 712 728 static struct serio_device_id lkkbd_serio_ids[] = { ··· 734 752 /* 735 753 * The functions for insering/removing us as a module. 736 754 */ 737 - static int __init 738 - lkkbd_init (void) 755 + static int __init lkkbd_init(void) 739 756 { 740 757 return serio_register_driver(&lkkbd_drv); 741 758 } 742 759 743 - static void __exit 744 - lkkbd_exit (void) 760 + static void __exit lkkbd_exit(void) 745 761 { 746 762 serio_unregister_driver(&lkkbd_drv); 747 763 } 748 764 749 - module_init (lkkbd_init); 750 - module_exit (lkkbd_exit); 765 + module_init(lkkbd_init); 766 + module_exit(lkkbd_exit); 751 767