diff options
author | Ville Syrjala <syrjala@sci.fi> | 2009-05-18 19:01:25 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-19 22:24:42 -0400 |
commit | 225c9886b9f873b219d1109148661b38da99a1ee (patch) | |
tree | 3094917c84fdafc04d794f81fdfbcf85a1988d1c /drivers | |
parent | a48b2d4a0091904b4cf57d667adc2faf689750d3 (diff) |
Input: ati_remote2 - use non-atomic bitops
No point in using atomic bitops when setting the input device keybits.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/misc/ati_remote2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c index 922c05141585..0501f0e65157 100644 --- a/drivers/input/misc/ati_remote2.c +++ b/drivers/input/misc/ati_remote2.c | |||
@@ -509,7 +509,7 @@ static int ati_remote2_setkeycode(struct input_dev *idev, int scancode, int keyc | |||
509 | 509 | ||
510 | old_keycode = ar2->keycode[mode][index]; | 510 | old_keycode = ar2->keycode[mode][index]; |
511 | ar2->keycode[mode][index] = keycode; | 511 | ar2->keycode[mode][index] = keycode; |
512 | set_bit(keycode, idev->keybit); | 512 | __set_bit(keycode, idev->keybit); |
513 | 513 | ||
514 | for (mode = 0; mode < ATI_REMOTE2_MODES; mode++) { | 514 | for (mode = 0; mode < ATI_REMOTE2_MODES; mode++) { |
515 | for (index = 0; index < ARRAY_SIZE(ati_remote2_key_table); index++) { | 515 | for (index = 0; index < ARRAY_SIZE(ati_remote2_key_table); index++) { |
@@ -518,7 +518,7 @@ static int ati_remote2_setkeycode(struct input_dev *idev, int scancode, int keyc | |||
518 | } | 518 | } |
519 | } | 519 | } |
520 | 520 | ||
521 | clear_bit(old_keycode, idev->keybit); | 521 | __clear_bit(old_keycode, idev->keybit); |
522 | 522 | ||
523 | return 0; | 523 | return 0; |
524 | } | 524 | } |
@@ -543,7 +543,7 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2) | |||
543 | for (mode = 0; mode < ATI_REMOTE2_MODES; mode++) { | 543 | for (mode = 0; mode < ATI_REMOTE2_MODES; mode++) { |
544 | for (index = 0; index < ARRAY_SIZE(ati_remote2_key_table); index++) { | 544 | for (index = 0; index < ARRAY_SIZE(ati_remote2_key_table); index++) { |
545 | ar2->keycode[mode][index] = ati_remote2_key_table[index].keycode; | 545 | ar2->keycode[mode][index] = ati_remote2_key_table[index].keycode; |
546 | set_bit(ar2->keycode[mode][index], idev->keybit); | 546 | __set_bit(ar2->keycode[mode][index], idev->keybit); |
547 | } | 547 | } |
548 | } | 548 | } |
549 | 549 | ||
@@ -554,11 +554,11 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2) | |||
554 | ar2->keycode[ATI_REMOTE2_AUX3][index] = KEY_PROG3; | 554 | ar2->keycode[ATI_REMOTE2_AUX3][index] = KEY_PROG3; |
555 | ar2->keycode[ATI_REMOTE2_AUX4][index] = KEY_PROG4; | 555 | ar2->keycode[ATI_REMOTE2_AUX4][index] = KEY_PROG4; |
556 | ar2->keycode[ATI_REMOTE2_PC][index] = KEY_PC; | 556 | ar2->keycode[ATI_REMOTE2_PC][index] = KEY_PC; |
557 | set_bit(KEY_PROG1, idev->keybit); | 557 | __set_bit(KEY_PROG1, idev->keybit); |
558 | set_bit(KEY_PROG2, idev->keybit); | 558 | __set_bit(KEY_PROG2, idev->keybit); |
559 | set_bit(KEY_PROG3, idev->keybit); | 559 | __set_bit(KEY_PROG3, idev->keybit); |
560 | set_bit(KEY_PROG4, idev->keybit); | 560 | __set_bit(KEY_PROG4, idev->keybit); |
561 | set_bit(KEY_PC, idev->keybit); | 561 | __set_bit(KEY_PC, idev->keybit); |
562 | 562 | ||
563 | idev->rep[REP_DELAY] = 250; | 563 | idev->rep[REP_DELAY] = 250; |
564 | idev->rep[REP_PERIOD] = 33; | 564 | idev->rep[REP_PERIOD] = 33; |