diff options
| author | yoyoerx <kevin.wepasnick@gmail.com> | 2016-03-09 14:04:14 -0500 | 
|---|---|---|
| committer | yoyoerx <kevin.wepasnick@gmail.com> | 2016-03-09 14:04:14 -0500 | 
| commit | d58b14e880580671a297be81303acbef5e28e0b3 (patch) | |
| tree | 1bdc01f6b3acf717389049a95193846bdb79a836 /quantum/matrix.c | |
| parent | 7d3ebd7b40b96f576fe4608b33f47329c334925b (diff) | |
| download | firmware-d58b14e880580671a297be81303acbef5e28e0b3.tar.gz firmware-d58b14e880580671a297be81303acbef5e28e0b3.tar.bz2 firmware-d58b14e880580671a297be81303acbef5e28e0b3.zip  | |
Addressed void* return warning & coding style
Diffstat (limited to 'quantum/matrix.c')
| -rw-r--r-- | quantum/matrix.c | 16 | 
1 files changed, 6 insertions, 10 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c index 95bf4c097..2dab6ae94 100644 --- a/quantum/matrix.c +++ b/quantum/matrix.c @@ -48,14 +48,14 @@ static void unselect_rows(void);  static void select_row(uint8_t row);  __attribute__ ((weak)) -void * matrix_init_kb(void) { +void matrix_init_kb(void) { -}; +}  __attribute__ ((weak)) -void * matrix_scan_kb(void) { +void matrix_scan_kb(void) { -}; +}  inline  uint8_t matrix_rows(void) @@ -86,9 +86,7 @@ void matrix_init(void)          matrix_debouncing[i] = 0;      } -    if (matrix_init_kb) { -        (*matrix_init_kb)(); -    } +    matrix_init_kb();  } @@ -152,9 +150,7 @@ uint8_t matrix_scan(void)      }  #endif -    if (matrix_scan_kb) { -        (*matrix_scan_kb)(); -    } +    matrix_scan_kb();      return 1;  }  | 
