vt: keyboard, use BIT() macro instead of open coded variants
PATCH v2 1/3 vt: keyboard, use BIT() macro instead of open coded variants
There are few places when BIT() macro is suitable and makes code easier to understand.
Signed-off-by Andy Shevchenko <[email protected]>
---
v2: left only BIT() conversion (Jiri)
drivers/tty/vt/keyboard.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/tty/vt/keyboard.c +13 -13
@@ -53,7 +53,7 @@* Exported functions/variables */ -#define KBD_DEFMODE ((1 << VC_REPEAT) | (1 << VC_META)) +#define KBD_DEFMODE (BIT(VC_REPEAT) | BIT(VC_META))#if defined(CONFIG_X86 ) || defined(CONFIG_PARISC )#include <asm/kbdleds.h>
@@ -857,9 +857,9 @@ static void k_shift(struct vc_data *vc, unsigned char value, char up_flag) shift_down[value]++;if (shift_down[value]) - shift_state |= (1 << value); + shift_state |=BIT (value);else - shift_state &= ~(1 << value); + shift_state &= ~BIT (value);/* kludge */ if (up_flag && shift_state != old_state && npadch_active) {
@@ -880,7 +880,7 @@ static void k_meta(struct vc_data *vc, unsigned char value, char up_flag)put_queue (vc,'\033' );put_queue (vc, value); }else -put_queue (vc, value |0x80 ); +put_queue (vc, value |BIT (7 )); }static void k_ascii (struct vc_data *vc,unsigned char value,char up_flag)
@@ -976,7 +976,7 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag)return ;if (!up_flag) { - pressed |=1 << (value -1 ); + pressed |=BIT (value -1 );if (!brl_timeout) committing = pressed; }else if (brl_timeout) {
@@ -986,7 +986,7 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag) committing = pressed; releasestart = jiffies; } - pressed &= ~(1 << (value -1 )); + pressed &= ~BIT (value -1 );if (!pressed && committing) {k_brlcommit (vc, committing,0 ); committing =0 ;
@@ -996,7 +996,7 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag)k_brlcommit (vc, committing,0 ); committing =0 ; } - pressed &= ~(1 << (value -1 )); + pressed &= ~BIT (value -1 ); } }
@@ -1096,9 +1096,9 @@ static int kbd_update_leds_helper(struct input_handle *handle, void *data)unsigned int leds = *(unsigned int *)data;if (test_bit (EV_LED , handle->dev->evbit)) { -input_inject_event (handle,EV_LED ,LED_SCROLLL , !!(leds &0x01 )); -input_inject_event (handle,EV_LED ,LED_NUML , !!(leds &0x02 )); -input_inject_event (handle,EV_LED ,LED_CAPSL , !!(leds &0x04 )); +input_inject_event (handle,EV_LED ,LED_SCROLLL , !!(leds &BIT (0 ))); +input_inject_event (handle,EV_LED ,LED_NUML , !!(leds &BIT (1 ))); +input_inject_event (handle,EV_LED ,LED_CAPSL , !!(leds &BIT (2 )));input_inject_event (handle,EV_SYN ,SYN_REPORT ,0 ); }
@@ -1427,8 +1427,8 @@ static void kbd_keycode(unsigned int keycode, int down, bool hw_raw)put_queue (vc, keycode | (!down <<7 )); }else {put_queue (vc, !down <<7 ); -put_queue (vc, (keycode >>7 ) |0x80 ); -put_queue (vc, keycode |0x80 ); +put_queue (vc, (keycode >>7 ) |BIT (7 )); +put_queue (vc, keycode |BIT (7 )); } raw_mode = true; }
@@ -1487,7 +1487,7 @@ static void kbd_keycode(unsigned int keycode, int down, bool hw_raw)if (type ==KT_LETTER ) { type =KT_LATIN ;if (vc_kbd_led (kbd,VC_CAPSLOCK )) { - key_map = key_maps[shift_final ^ (1 <<KG_SHIFT )]; + key_map = key_maps[shift_final ^BIT (KG_SHIFT )];if (key_map) keysym = key_map[keycode]; }
Signature · 1 line
2.28.0
PATCH v2 2/3 vt: keyboard, replace numbers with \r, \n where appropriate
Instead of 10, 13 use \n, \r respectively.
Signed-off-by Andy Shevchenko <[email protected]>
Acked-by Jiri Slaby <[email protected]>
---
v2: added Ack (Jiri)
drivers/tty/vt/keyboard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/tty/vt/keyboard.c +3 -3
@@ -462,9 +462,9 @@ static void fn_enter(struct vc_data *vc) diacr =0 ; } -put_queue (vc,13 ); +put_queue (vc,'\r' );if (vc_kbd_mode (kbd,VC_CRLF )) -put_queue (vc,10 ); +put_queue (vc,'\n' ); }static void fn_caps_toggle (struct vc_data *vc)
@@ -827,7 +827,7 @@ static void k_pad(struct vc_data *vc, unsigned char value, char up_flag)put_queue (vc, pad_chars[value]);if (value ==KVAL (K_PENTER ) &&vc_kbd_mode (kbd,VC_CRLF )) -put_queue (vc,10 ); +put_queue (vc,'\n' ); }static void k_shift (struct vc_data *vc,unsigned char value,char up_flag)
Signature · 1 line
2.28.0
PATCH v2 3/3 vt: keyboard, make use of assign_bit() API
In reply to Andy ShevchenkoWe have for some time the assign_bit() API to replace open coded
if (foo) set_bit(n, bar); else clear_bit(n, bar);
Use this API in VT keyboard library code.
Signed-off-by Andy Shevchenko <[email protected]>
Acked-by Jiri Slaby <[email protected]>
---
v2: added Ack (Jiri)
drivers/tty/vt/keyboard.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/tty/vt/keyboard.c +1 -4
@@ -1433,10 +1433,7 @@ static void kbd_keycode(unsigned int keycode, int down, bool hw_raw) raw_mode = true; } -if (down) -set_bit (keycode, key_down); -else -clear_bit (keycode, key_down); +assign_bit (keycode, key_down, down); if (rep && (!vc_kbd_mode(kbd, VC_REPEAT) ||
Signature · 1 line
2.28.0