3 files changed, 18 insertions, 28 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;
 }
diff --git a/quantum/template/template.c b/quantum/template/template.c
index 7be7dfc3d..7dcd67cfc 100644
--- a/quantum/template/template.c
+++ b/quantum/template/template.c
@@ -1,29 +1,23 @@
 #include "%KEYBOARD%.h"
 
 __attribute__ ((weak))
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
         // leave these blank
-};
+}
 
 __attribute__ ((weak))
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
         // leave these blank
-};
+}
 
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
         // put your keyboard start-up code here
         // runs once when the firmware starts up
+        matrix_init_user();
+}
 
-        if (matrix_init_user) {
-                (*matrix_init_user)();
-        }
-};
-
-void * matrix_scan_kb(void) {
+void matrix_scan_kb(void) {
         // put your looping keyboard code here
         // runs every cycle (a lot)
-
-        if (matrix_scan_user) {
-                (*matrix_scan_user)();
-        }
-};
\ No newline at end of file
+        matrix_scan_user();
+}
\ No newline at end of file
diff --git a/quantum/template/template.h b/quantum/template/template.h
index a15061b26..1171dc8e0 100644
--- a/quantum/template/template.h
+++ b/quantum/template/template.h
@@ -19,7 +19,7 @@
     { k10, KC_NO, k11 }, \
 } 
 
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
 
 #endif
\ No newline at end of file