summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/matrix.c
diff options
context:
space:
mode:
authorWojciech Siewierski <wojciech.siewierski@onet.pl>2016-04-03 11:14:08 +0200
committerWojciech Siewierski <wojciech.siewierski@onet.pl>2016-04-03 11:23:00 +0200
commit47dd29513eeec7b7f639bef6df441a905ce8bacb (patch)
tree29170847273e786384bd3d7c7781e67dc4335bbb /keyboard/ergodox_ez/matrix.c
parent8ef14d09b8451b3f2a77e6f019922eae0ac43642 (diff)
parent8d39263d2444f0273327902684c802b218efb7b6 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix
Diffstat (limited to 'keyboard/ergodox_ez/matrix.c')
-rw-r--r--keyboard/ergodox_ez/matrix.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/keyboard/ergodox_ez/matrix.c b/keyboard/ergodox_ez/matrix.c
index 3e1d69444b..c4f5b179f0 100644
--- a/keyboard/ergodox_ez/matrix.c
+++ b/keyboard/ergodox_ez/matrix.c
@@ -62,12 +62,12 @@ uint32_t matrix_scan_count;
__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)
@@ -102,9 +102,7 @@ void matrix_init(void)
matrix_scan_count = 0;
#endif
- if (matrix_init_kb) {
- (*matrix_init_kb)();
- }
+ matrix_init_kb();
}
@@ -163,9 +161,7 @@ uint8_t matrix_scan(void)
}
- if (matrix_scan_kb) {
- (*matrix_scan_kb)();
- }
+ matrix_scan_kb();
return 1;
}