summaryrefslogtreecommitdiff
path: root/keyboard/planck/planck.c
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-03-22 17:29:31 -0400
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-03-22 17:29:31 -0400
commita4ff9f256738cf637553e7840d53f778d791fb6f (patch)
tree91d327587401e69843eecb353e97a3119aa9939b /keyboard/planck/planck.c
parente36a441274e9e494e1d8e38df1901f3acf9def27 (diff)
parent403d756ad56de18488e3d048e849c55e77a20b32 (diff)
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/planck/planck.c')
-rw-r--r--keyboard/planck/planck.c24
1 files changed, 10 insertions, 14 deletions
diff --git a/keyboard/planck/planck.c b/keyboard/planck/planck.c
index 63ca54761c..fe8731ec7b 100644
--- a/keyboard/planck/planck.c
+++ b/keyboard/planck/planck.c
@@ -1,16 +1,16 @@
#include "planck.h"
__attribute__ ((weak))
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
-};
+}
__attribute__ ((weak))
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
-};
+}
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
backlight_init_ports();
#endif
@@ -24,13 +24,9 @@ void * matrix_init_kb(void) {
DDRE |= (1<<6);
PORTE |= (1<<6);
- if (matrix_init_user) {
- (*matrix_init_user)();
- }
-};
+ matrix_init_user();
+}
-void * matrix_scan_kb(void) {
- if (matrix_scan_user) {
- (*matrix_scan_user)();
- }
-};
+void matrix_scan_kb(void) {
+ matrix_scan_user();
+}