summaryrefslogtreecommitdiffstats
path: root/quantum/matrix.c
diff options
context:
space:
mode:
authoryoyoerx <kevin.wepasnick@gmail.com>2016-03-10 17:28:34 +0100
committeryoyoerx <kevin.wepasnick@gmail.com>2016-03-10 17:28:34 +0100
commit641859df84bf40025b2c14319d1a168a435562e2 (patch)
tree006e8cdd6bef18921b3c4e5cf7cebda67da27779 /quantum/matrix.c
parent7d3ebd7b40b96f576fe4608b33f47329c334925b (diff)
downloadqmk_firmware-641859df84bf40025b2c14319d1a168a435562e2.tar.gz
qmk_firmware-641859df84bf40025b2c14319d1a168a435562e2.tar.xz
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);
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;
}