diff options
| author | yoyoerx <kevin.wepasnick@gmail.com> | 2016-03-10 11:28:34 -0500 |
|---|---|---|
| committer | yoyoerx <kevin.wepasnick@gmail.com> | 2016-03-10 11:28:34 -0500 |
| commit | 641859df84bf40025b2c14319d1a168a435562e2 (patch) | |
| tree | 006e8cdd6bef18921b3c4e5cf7cebda67da27779 /quantum/matrix.c | |
| parent | 7d3ebd7b40b96f576fe4608b33f47329c334925b (diff) | |
| download | qmk_firmware-641859df84bf40025b2c14319d1a168a435562e2.tar.gz qmk_firmware-641859df84bf40025b2c14319d1a168a435562e2.zip | |
Addressed void* return warning in all keymaps
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); | |||
| 48 | static void select_row(uint8_t row); | 48 | static void select_row(uint8_t row); |
| 49 | 49 | ||
| 50 | __attribute__ ((weak)) | 50 | __attribute__ ((weak)) |
| 51 | void * matrix_init_kb(void) { | 51 | void matrix_init_kb(void) { |
| 52 | 52 | ||
| 53 | }; | 53 | } |
| 54 | 54 | ||
| 55 | __attribute__ ((weak)) | 55 | __attribute__ ((weak)) |
| 56 | void * matrix_scan_kb(void) { | 56 | void matrix_scan_kb(void) { |
| 57 | 57 | ||
| 58 | }; | 58 | } |
| 59 | 59 | ||
| 60 | inline | 60 | inline |
| 61 | uint8_t matrix_rows(void) | 61 | uint8_t matrix_rows(void) |
| @@ -86,9 +86,7 @@ void matrix_init(void) | |||
| 86 | matrix_debouncing[i] = 0; | 86 | matrix_debouncing[i] = 0; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | if (matrix_init_kb) { | 89 | matrix_init_kb(); |
| 90 | (*matrix_init_kb)(); | ||
| 91 | } | ||
| 92 | } | 90 | } |
| 93 | 91 | ||
| 94 | 92 | ||
| @@ -152,9 +150,7 @@ uint8_t matrix_scan(void) | |||
| 152 | } | 150 | } |
| 153 | #endif | 151 | #endif |
| 154 | 152 | ||
| 155 | if (matrix_scan_kb) { | 153 | matrix_scan_kb(); |
| 156 | (*matrix_scan_kb)(); | ||
| 157 | } | ||
| 158 | 154 | ||
| 159 | return 1; | 155 | return 1; |
| 160 | } | 156 | } |
