diff options
author | Erez Zukerman <bulk@ezuk.org> | 2016-03-22 21:30:25 +0200 |
---|---|---|
committer | Erez Zukerman <bulk@ezuk.org> | 2016-03-22 21:30:25 +0200 |
commit | 403d756ad56de18488e3d048e849c55e77a20b32 (patch) | |
tree | b02cd9a378a29d9b8cde07a7d97b46c24e74a3b1 /quantum/matrix.c | |
parent | 7f0d77e08c6b5d75a1f912051e6d2928d66e7c3b (diff) | |
parent | baeffd99da5603cd5156bbcf0cd45ae62711858f (diff) | |
download | firmware-403d756ad56de18488e3d048e849c55e77a20b32.tar.gz firmware-403d756ad56de18488e3d048e849c55e77a20b32.tar.bz2 firmware-403d756ad56de18488e3d048e849c55e77a20b32.zip |
Merge pull request #190 from yoyoerx/function_pointers
Addressing 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; } |