summaryrefslogtreecommitdiffstats
path: root/keyboard/planck/planck.c
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2016-03-22 21:30:25 +0200
committerErez Zukerman <bulk@ezuk.org>2016-03-22 21:30:25 +0200
commit403d756ad56de18488e3d048e849c55e77a20b32 (patch)
treeb02cd9a378a29d9b8cde07a7d97b46c24e74a3b1 /keyboard/planck/planck.c
parent7f0d77e08c6b5d75a1f912051e6d2928d66e7c3b (diff)
parentbaeffd99da5603cd5156bbcf0cd45ae62711858f (diff)
Merge pull request #190 from yoyoerx/function_pointers
Addressing void* return warning & coding style
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();
+}