@@ -108,8 +108,8 @@ struct pxa27x_keypad {
108108 unsigned int row_shift ;
109109
110110 /* state row bits of each column scan */
111- uint32_t matrix_key_state [MAX_MATRIX_KEY_COLS ];
112- uint32_t direct_key_state ;
111+ u32 matrix_key_state [MAX_MATRIX_KEY_COLS ];
112+ u32 direct_key_state ;
113113
114114 unsigned int direct_key_mask ;
115115};
@@ -410,8 +410,8 @@ static void pxa27x_keypad_scan_matrix(struct pxa27x_keypad *keypad)
410410 const struct pxa27x_keypad_platform_data * pdata = keypad -> pdata ;
411411 struct input_dev * input_dev = keypad -> input_dev ;
412412 int row , col , num_keys_pressed = 0 ;
413- uint32_t new_state [MAX_MATRIX_KEY_COLS ];
414- uint32_t kpas = keypad_readl (KPAS );
413+ u32 new_state [MAX_MATRIX_KEY_COLS ];
414+ u32 kpas = keypad_readl (KPAS );
415415
416416 num_keys_pressed = KPAS_MUKP (kpas );
417417
@@ -434,10 +434,10 @@ static void pxa27x_keypad_scan_matrix(struct pxa27x_keypad *keypad)
434434 }
435435
436436 if (num_keys_pressed > 1 ) {
437- uint32_t kpasmkp0 = keypad_readl (KPASMKP0 );
438- uint32_t kpasmkp1 = keypad_readl (KPASMKP1 );
439- uint32_t kpasmkp2 = keypad_readl (KPASMKP2 );
440- uint32_t kpasmkp3 = keypad_readl (KPASMKP3 );
437+ u32 kpasmkp0 = keypad_readl (KPASMKP0 );
438+ u32 kpasmkp1 = keypad_readl (KPASMKP1 );
439+ u32 kpasmkp2 = keypad_readl (KPASMKP2 );
440+ u32 kpasmkp3 = keypad_readl (KPASMKP3 );
441441
442442 new_state [0 ] = kpasmkp0 & KPASMKP_MKC_MASK ;
443443 new_state [1 ] = (kpasmkp0 >> 16 ) & KPASMKP_MKC_MASK ;
@@ -450,7 +450,7 @@ static void pxa27x_keypad_scan_matrix(struct pxa27x_keypad *keypad)
450450 }
451451scan :
452452 for (col = 0 ; col < pdata -> matrix_key_cols ; col ++ ) {
453- uint32_t bits_changed ;
453+ u32 bits_changed ;
454454 int code ;
455455
456456 bits_changed = keypad -> matrix_key_state [col ] ^ new_state [col ];
@@ -474,7 +474,7 @@ static void pxa27x_keypad_scan_matrix(struct pxa27x_keypad *keypad)
474474
475475#define DEFAULT_KPREC (0x007f007f)
476476
477- static inline int rotary_delta (uint32_t kprec )
477+ static inline int rotary_delta (u32 kprec )
478478{
479479 if (kprec & KPREC_OF0 )
480480 return (kprec & 0xff ) + 0x7f ;
@@ -511,7 +511,7 @@ static void report_rotary_event(struct pxa27x_keypad *keypad, int r, int delta)
511511static void pxa27x_keypad_scan_rotary (struct pxa27x_keypad * keypad )
512512{
513513 const struct pxa27x_keypad_platform_data * pdata = keypad -> pdata ;
514- uint32_t kprec ;
514+ u32 kprec ;
515515
516516 /* read and reset to default count value */
517517 kprec = keypad_readl (KPREC );
@@ -529,7 +529,7 @@ static void pxa27x_keypad_scan_direct(struct pxa27x_keypad *keypad)
529529 const struct pxa27x_keypad_platform_data * pdata = keypad -> pdata ;
530530 struct input_dev * input_dev = keypad -> input_dev ;
531531 unsigned int new_state ;
532- uint32_t kpdk , bits_changed ;
532+ u32 kpdk , bits_changed ;
533533 int i ;
534534
535535 kpdk = keypad_readl (KPDK );
0 commit comments