aboutsummaryrefslogtreecommitdiff
path: root/quantum/matrix.c
diff options
context:
space:
mode:
authoryoyoerx <kevin.wepasnick@gmail.com>2016-03-10 11:28:34 -0500
committeryoyoerx <kevin.wepasnick@gmail.com>2016-03-10 11:28:34 -0500
commit641859df84bf40025b2c14319d1a168a435562e2 (patch)
tree006e8cdd6bef18921b3c4e5cf7cebda67da27779 /quantum/matrix.c
parent7d3ebd7b40b96f576fe4608b33f47329c334925b (diff)
downloadqmk_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.c16
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);
48static void select_row(uint8_t row); 48static void select_row(uint8_t row);
49 49
50__attribute__ ((weak)) 50__attribute__ ((weak))
51void * matrix_init_kb(void) { 51void matrix_init_kb(void) {
52 52
53}; 53}
54 54
55__attribute__ ((weak)) 55__attribute__ ((weak))
56void * matrix_scan_kb(void) { 56void matrix_scan_kb(void) {
57 57
58}; 58}
59 59
60inline 60inline
61uint8_t matrix_rows(void) 61uint8_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}