wip

keyboards/business_card/beta/beta.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "beta.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/

keyboards/business_card/business_card.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "business_card.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/

keyboards/butterstick/butterstick.c

@@ -14,37 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "butterstick.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-*/
-
-void matrix_scan_kb(void) {
-#ifdef DEBUG_MATRIX
-    for (uint8_t c = 0; c < MATRIX_COLS; c++)
-		for (uint8_t r = 0; r < MATRIX_ROWS; r++)
-		  if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c);
-#endif
-
-  matrix_scan_user();
-}
-
-/*
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/

keyboards/candybar/candybar.c

@@ -15,7 +15,3 @@
  */
 
 #include "candybar.h"
-
-void matrix_init_kb(void) {
-  matrix_init_user();
-}

keyboards/cannonkeys/satisfaction75/satisfaction75.c

@@ -247,11 +247,6 @@ uint32_t layer_state_set_kb(uint32_t state) {
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    /* FIXME(skullydazed):
-     *     Originally this code always ran no matter what process_record_user() did.
-     *     With this PR it will only run if process_record_user() returns true. We
-     *     should think through the implications here.
-     */
   queue_for_send = true;
   switch (keycode) {
     case OLED_TOGG:
@@ -376,7 +371,6 @@ void matrix_init_kb(void)
   rtcGetTime(&RTCD1, &last_timespec);
   queue_for_send = true;
   backlight_init_ports();
-  matrix_init_user();
 }
 
 

keyboards/cannonkeys/stm32f072/keyboard.c

@@ -74,15 +74,9 @@ void matrix_scan_kb(void)
   #ifdef RGBLIGHT_ENABLE
     rgblight_task();
   #endif
-    matrix_scan_user();
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    /* FIXME(skullydazed):
-     *     Originally this code always ran no matter what process_record_user() did.
-     *     With this PR it will only run if process_record_user() returns true. We
-     *     should think through the implications here.
-     */
   switch (keycode) {
     case BL_INC:
       if (record->event.pressed) {

keyboards/centromere/centromere.c

@@ -31,7 +31,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }

keyboards/centromere/matrix.c

@@ -50,12 +50,10 @@ static matrix_row_t matrix[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/chimera_ergo/chimera_ergo.c

@@ -15,17 +15,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}

keyboards/chimera_ergo/matrix.c

@@ -59,12 +59,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/chimera_ls/chimera_ls.c

@@ -15,17 +15,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}

keyboards/chimera_ls/matrix.c

@@ -64,12 +64,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/chimera_ortho/chimera_ortho.c

@@ -15,17 +15,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}

keyboards/chimera_ortho/matrix.c

@@ -49,12 +49,10 @@ static matrix_row_t matrix[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/choco60/choco60.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "choco60.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/

keyboards/christmas_tree/christmas_tree.c

@@ -1,5 +1 @@
 #include "christmas_tree.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-}

keyboards/ckeys/handwire_101/handwire_101.c

@@ -1,22 +1 @@
 #include "handwire_101.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	// Turn status LED on
-	//DDRD |= (1<<6);
-	//PORTD |= (1<<6);
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-	led_set_user(usb_led);
-}

keyboards/ckeys/nakey/nakey.c

@@ -13,23 +13,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "nakey.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/ckeys/obelus/obelus.c

@@ -6,17 +6,4 @@ void matrix_init_kb(void) {
 	// Turn status LED on
 	DDRD |= (1<<6);
 	PORTD |= (1<<6);
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-	led_set_user(usb_led);
 }

keyboards/ckeys/thedora/thedora.c

@@ -1,22 +1 @@
 #include "thedora.h"
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-  // Turn status LED on
-  //DDRD |= (1<<6);
-  //PORTD |= (1<<6);
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-  led_set_user(usb_led);
-}

keyboards/claw44/rev1/matrix.c

@@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/clueboard/17/17.c

@@ -2,16 +2,6 @@
 
 int pwm_level;
 
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-};
-
-void led_set_kb(uint8_t usb_led) {
-    print("led_set\n");
-}
-
 void backlight_init_ports(void) {
     // Set C7 to output
     DDRC |= (1<<7);

keyboards/clueboard/2x1800/2x1800.c

@@ -20,13 +20,6 @@ void matrix_init_kb(void) {
 	DDRB |= (1<<4);  // Numlock
 	DDRB |= (1<<5);  // Capslock
 	DDRB |= (1<<6);  // Scroll Lock
-
-	// Run the keymap level init
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {

keyboards/clueboard/60/60.c

@@ -14,11 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "60.h"
-
-void matrix_init_kb(void) {
-
-}
-
-void matrix_scan_kb(void) {
-
-}

keyboards/clueboard/66/rev2/rev2.c

@@ -6,15 +6,9 @@
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	led_init_ports();
 }
 
-
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output

keyboards/clueboard/66/rev3/rev3.c

@@ -6,15 +6,9 @@
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
-    matrix_init_user();
     led_init_ports();
 }
 
-
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output

keyboards/clueboard/66/rev4/rev4.c

@@ -4,14 +4,9 @@
 void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
-    matrix_init_user();
     led_init_ports();
 }
 
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output

keyboards/clueboard/66_hotswap/gen1/matrix.c

@@ -28,12 +28,10 @@ void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-  matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
 
 void matrix_init(void) {

keyboards/clueboard/66_hotswap/prototype/prototype.c

@@ -6,15 +6,9 @@
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	led_init_ports();
 }
 
-
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output

keyboards/clueboard/card/card.c

@@ -3,26 +3,6 @@
 #define BL_GREEN OCR1A
 #define BL_BLUE OCR1C
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
-
 void backlight_init_ports(void)
 {
 	// Set B5, B6, and B7 as output

keyboards/cocoa40/cocoa40.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "cocoa40.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/comet46/comet46.c

@@ -5,18 +5,5 @@ void uart_init(void) {
 }
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 }
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-}

keyboards/comet46/matrix.c

@@ -49,12 +49,10 @@ static matrix_row_t matrix[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/converter/adb_usb/matrix.c

@@ -40,12 +40,10 @@ static void register_key(uint8_t key);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/converter/hp_46010a/matrix.c

@@ -62,12 +62,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {    
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -241,4 +239,4 @@ uint8_t matrix_cols(void) {
 // the online ducmentation starting from : 
 // https://docs.qmk.fm/#/config_options
 // https://docs.qmk.fm/#/understanding_qmk
-// and probably a few i forgot....
+// and probably a few i forgot....

keyboards/converter/ibm_5291/matrix.c

@@ -196,12 +196,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {    
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/converter/m0110_usb/matrix.c

@@ -49,12 +49,10 @@ static void register_key(uint8_t key);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -118,4 +116,4 @@ static void register_key(uint8_t key)
     } else {
         matrix[ROW(key)] |=  (1<<COL(key));
     }
-}
+}

keyboards/converter/modelm101/modelm101.c

@@ -25,20 +25,6 @@ void keyboard_pre_init_kb(void) {
   writePinHigh(B6);
 }
 
-void matrix_init_kb(void) {
-  /* put your keyboard start-up code here
-   * runs once when the firmware starts up */
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  /* put your looping keyboard code here
-   * runs every cycle (a lot) */
-
-  matrix_scan_user();
-}
-
 void led_set_kb(uint8_t usb_led) {
   if (usb_led & (1<<USB_LED_NUM_LOCK)) {
     writePinLow(B4);
@@ -55,6 +41,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(B5);
   }
-
-  led_set_user(usb_led);
 }

keyboards/converter/numeric_keypad_IIe/numeric_keypad_IIe.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "numeric_keypad_IIe.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/converter/palm_usb/matrix.c

@@ -63,12 +63,10 @@ static bool is_modified = false;
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/converter/siemens_tastatur/matrix.c

@@ -231,12 +231,10 @@ void matrix_print(void)
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/converter/siemens_tastatur/siemens_tastatur.c

@@ -15,24 +15,3 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "siemens_tastatur.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
-

keyboards/converter/sun_usb/matrix.c

@@ -42,12 +42,10 @@ static bool is_modified = false;
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/converter/usb_usb/custom_matrix.cpp

@@ -118,7 +118,6 @@ extern "C"
 
     __attribute__ ((weak))
     void matrix_init_kb(void) {
-        matrix_init_user();
     }
 
     __attribute__ ((weak))
@@ -127,7 +126,6 @@ extern "C"
 
     __attribute__ ((weak))
     void matrix_scan_kb(void) {
-        matrix_scan_user();
     }
 
     __attribute__ ((weak))

keyboards/converter/xt_usb/matrix.c

@@ -35,12 +35,10 @@ static uint8_t matrix[MATRIX_ROWS];
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/coseyfannitutti/mullet/mullet.c

@@ -14,10 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mullet.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}

keyboards/coseyfannitutti/mulletpad/mulletpad.c

@@ -14,10 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mulletpad.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}

keyboards/crkbd/rev1/matrix.c

@@ -65,12 +65,10 @@ static uint8_t matrix_master_scan(void);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/crkbd/rev1/rev1.c

@@ -68,9 +68,6 @@ led_config_t g_led_config = { {
 } };
 #endif
 
-__attribute__((weak))
-void matrix_init_user(void) {}
-
 void matrix_init_kb(void) {
 
 #ifdef RGB_MATRIX_ENABLE
@@ -105,5 +102,4 @@ void matrix_init_kb(void) {
         } };
     }
 #endif
-    matrix_init_user();
 }

keyboards/cu75/cu75.c

@@ -22,8 +22,6 @@ void matrix_init_kb(void)
 {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
-    matrix_init_user();
-
 #ifdef AUDIO_ENABLE
     audio_init();
     PLAY_NOTE_ARRAY(test_sound, false, STACCATO);
@@ -69,7 +67,6 @@ void matrix_scan_kb(void)
         twi_last_ready++;
     }
 #endif
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration){
@@ -86,11 +83,6 @@ void click(uint16_t freq, uint16_t duration){
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record)
 {
-    /* FIXME(skullydazed):
-     *     Originally this code always ran no matter what process_record_user() did.
-     *     With this PR it will only run if process_record_user() returns true. We
-     *     should think through the implications here.
-     */
     // Test code that turns on the switch led for the key that is pressed
     // set_backlight_by_keymap(record->event.key.col, record->event.key.row);
     if (click_toggle && record->event.pressed){
@@ -168,13 +160,6 @@ void reset_keyboard_kb(){
     reset_keyboard();
 }
 
-void led_set_kb(uint8_t usb_led)
-{
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-    led_set_user(usb_led);
-}
-
 // LFK lighting info
 const uint8_t switch_matrices[] = {0, 1};
 const uint8_t rgb_matrices[] = {6, 7};

keyboards/cutie_club/wraith/wraith.c

@@ -22,11 +22,6 @@
 void matrix_init_kb(void) {
   setPinOutput(B3);
   setPinOutput(B0);
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -35,5 +30,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         writePinHigh(B3);
     }
-  led_set_user(usb_led);
 }

keyboards/dc01/arrow/arrow.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "arrow.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/dc01/arrow/matrix.c

@@ -103,12 +103,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -401,4 +399,4 @@ void matrix_setup(void){
         i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
         sei(); //enable interupts
     }
-}
+}

keyboards/dc01/left/left.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "left.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/dc01/left/matrix.c

@@ -109,12 +109,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -461,4 +459,4 @@ i2c_status_t i2c_transaction(uint8_t address, uint32_t mask, uint8_t col_offset)
 
     i2c_stop();
     return 0;
-}
+}

keyboards/dc01/numpad/matrix.c

@@ -103,12 +103,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -401,4 +399,4 @@ void matrix_setup(void){
         i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
         sei(); //enable interupts
     }
-}
+}

keyboards/dc01/numpad/numpad.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "numpad.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/dc01/right/matrix.c

@@ -103,12 +103,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -401,4 +399,4 @@ void matrix_setup(void){
         i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
         sei(); //enable interupts
     }
-}
+}

keyboards/dc01/right/right.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "right.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/dichotomy/dichotomy.c

@@ -73,7 +73,6 @@ void led_init(void) {
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
-	matrix_init_user();
 	uart_init();
 	led_init();
 }
@@ -81,7 +80,6 @@ void matrix_init_kb(void) {
 void matrix_scan_kb(void) {
 	// put your looping keyboard code here
 	// runs every cycle (a lot)
-	matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {

keyboards/dichotomy/matrix.c

@@ -65,12 +65,10 @@ void matrix_scan_quantum(void) {
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/dk60/dk60.c

@@ -21,8 +21,6 @@ void dk60_blink_all_leds(void)
 void matrix_init_kb(void) {
     led_init_ports();
     dk60_blink_all_leds();
-
-    matrix_init_user();
 }
 
 void led_init_ports(void) {
@@ -39,6 +37,4 @@ void led_set_kb(uint8_t usb_led) {
 		// Turn capslock off
 		dk60_caps_led_off();
 	}
-
-	led_set_user(usb_led);
 }

keyboards/do60/do60.c

@@ -13,17 +13,10 @@ extern inline void setdefaultrgb(void);
 void matrix_init_kb(void) {
   // Keyboard start-up code goes here
   // Runs once when the firmware starts up
-  matrix_init_user();
   led_init_ports();
   setdefaultrgb();
 };
 
-void matrix_scan_kb(void) {
-  // Looping keyboard code goes here
-  // This runs every cycle (a lot)
-  matrix_scan_user();
-};
-
 void led_init_ports(void) {
   // Set caps lock LED pin as output
   DDRB |= (1 << 2);
@@ -38,8 +31,6 @@ void led_set_kb(uint8_t usb_led) {
 	//	do60_caps_led_off();
 	//}
 
-	//led_set_user(usb_led);
-
 	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
         // Turn capslock on
         PORTB &= ~(1<<2);

keyboards/donutcables/scrabblepad/scrabblepad.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "scrabblepad.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/doro67/multi/multi.c

@@ -14,30 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "multi.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-    setPinOutput(E6);
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-		writePinLow(E6);
-	} else {
-		writePinHigh(E6);
-	}
-
-	led_set_user(usb_led);
-}

keyboards/doro67/regular/regular.c

@@ -16,25 +16,16 @@
 #include "regular.h"
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
+    // put your keyboard start-up code here
-	// runs once when the firmware starts up
+    // runs once when the firmware starts up
-  setPinOutput(E6);
+    setPinOutput(E6);
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
+    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinLow(E6);
+        writePinLow(E6);
-  } else {
+    } else {
-    writePinHigh(E6);
+        writePinHigh(E6);
-  }
+    }
-	led_set_user(usb_led);
 }

keyboards/doro67/rgb/rgb.c

@@ -26,14 +26,6 @@ void matrix_init_kb(void) {
   // put your keyboard start-up code here
   // runs once when the firmware starts up
   setPinOutput(E6);
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -43,7 +35,6 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(E6);
   }
-	led_set_user(usb_led);
 }
 
 led_config_t g_led_config = { {

keyboards/dozen0/dozen0.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "dozen0.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/dp60/matrix.c

@@ -15,13 +15,11 @@ static void select_col(uint8_t col);
 __attribute__ ((weak))
 void matrix_init_kb(void)
 {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void)
 {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -242,4 +240,4 @@ static void select_col(uint8_t col) {
           writePinHigh(D5);
           break;
     }
-}
+}

keyboards/duck/eagle_viper/v2/matrix.c

@@ -36,12 +36,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/duck/jetfire/matrix.c

@@ -34,12 +34,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))
@@ -274,4 +272,4 @@ static void select_col(uint8_t col)
             PORTB |= 0b00000001;
             break;
     }
-}
+}

keyboards/duck/lightsaver/matrix.c

@@ -37,12 +37,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/duck/octagon/v1/matrix.c

@@ -36,12 +36,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/duck/octagon/v2/matrix.c

@@ -36,12 +36,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/duck/orion/v3/matrix.c

@@ -30,12 +30,10 @@ static void select_col(uint8_t col);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/dumbpad/dumbpad.c

@@ -19,8 +19,6 @@ void keyboard_pre_init_kb(void) {
   // Set the layer LED IO as outputs
   setPinOutput(LAYER_INDICATOR_LED_0);
   setPinOutput(LAYER_INDICATOR_LED_1);
-  
-  keyboard_pre_init_user();
 }
 
 void shutdown_user() {
@@ -58,19 +56,4 @@ void matrix_init_kb(void) {
     writePin(LAYER_INDICATOR_LED_1, false);
     wait_ms(100);
   }
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
 }

keyboards/dz60/dz60.c

@@ -4,16 +4,9 @@
 void matrix_init_kb(void) {
   // Keyboard start-up code goes here
   // Runs once when the firmware starts up
-  matrix_init_user();
   led_init_ports();
 };
 
-void matrix_scan_kb(void) {
-  // Looping keyboard code goes here
-  // This runs every cycle (a lot)
-  matrix_scan_user();
-};
-
 void led_init_ports(void) {
   // Set caps lock LED pin as output
   DDRB |= (1 << 2);
@@ -27,6 +20,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         PORTB |= (1 << 2);
     }
-
-    led_set_user(usb_led);
 }

keyboards/efreet/efreet.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "efreet.h"
-
-// Optional override functions below.
-// You can leave any or all of these undefined.
-// These are only required if you want to perform custom actions.
-
-/*
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}
-
-*/

keyboards/ep/40/40.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "40.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/ep/96/96.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "96.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/ep/comsn/hs68/hs68.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "hs68.h"
-
-void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-  led_set_user(usb_led);
-}

keyboards/ep/comsn/mollydooker/mollydooker.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mollydooker.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/ep/comsn/tf_longeboye/tf__longeboye.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "tf_longeboye.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}

keyboards/ergodash/rev1/rev1.c

@@ -5,13 +5,6 @@
     float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
 #endif
 
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
 void matrix_init_kb(void) {
 
     #ifdef AUDIO_ENABLE
@@ -26,8 +19,6 @@ void matrix_init_kb(void) {
     // // orange led on
     // DDRB |= (1<<0);
     // PORTB &= ~(1<<0);
-
-	matrix_init_user();
 };
 
 void shutdown_user(void) {

keyboards/ergodone/ergodone.c

@@ -20,7 +20,6 @@ void ergodox_blink_all_leds(void);
 void matrix_init_kb(void) {
   ergodox_led_init();
   ergodox_blink_all_leds();
-  matrix_init_user();
 }
 
 void ergodox_led_init(void)

keyboards/ergodone/matrix.c

@@ -46,12 +46,10 @@ void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-  matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
 
 inline

keyboards/ergodox_ez/ergodox_ez.c

@@ -56,8 +56,6 @@ void matrix_init_kb(void) {
 #endif
 
     ergodox_blink_all_leds();
-
-    matrix_init_user();
 }
 
 void ergodox_blink_all_leds(void)
@@ -330,18 +328,12 @@ void suspend_power_down_kb(void) {
 #ifdef ORYX_CONFIGURATOR
 void keyboard_post_init_kb(void) {
     rgb_matrix_enable_noeeprom();
-    keyboard_post_init_user();
 }
 #endif
 #endif
 
 #ifdef ORYX_CONFIGURATOR
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    /* FIXME(skullydazed):
-     *     Originally this code always ran no matter what process_record_user() did.
-     *     With this PR it will only run if process_record_user() returns true. We
-     *     should think through the implications here.
-     */
     switch (keycode) {
         case LED_LEVEL:
             if (record->event.pressed) {
@@ -392,5 +384,4 @@ void eeconfig_init_kb(void) {  // EEPROM is getting reset!
     keyboard_config.led_level = 4;
     keyboard_config.rgb_matrix_enable = true;
     eeconfig_update_kb(keyboard_config.raw);
-    eeconfig_init_user();
 }

keyboards/ergodox_ez/matrix.c

@@ -60,9 +60,9 @@ __attribute__((weak)) void matrix_init_user(void) {}
 
 __attribute__((weak)) void matrix_scan_user(void) {}
 
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
+__attribute__((weak)) void matrix_init_kb(void) {}
 
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
+__attribute__((weak)) void matrix_scan_kb(void) {}
 
 inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
 

keyboards/ergodox_infinity/ergodox_infinity.c

@@ -109,23 +109,12 @@ void matrix_scan_user(void) {
 
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
 	// The backlight always has to be initialized, otherwise it will stay lit
 #ifndef VISUALIZER_ENABLE
 	lcd_backlight_hal_init();
 #endif
 }
 
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
 bool is_keyboard_master(void) {
     return is_serial_link_master();
 }

keyboards/ergodox_stm32/ergodox_stm32.c

@@ -20,8 +20,6 @@ void matrix_init_kb(void)
     palSetPadMode(GPIOA, 8, PAL_MODE_OUTPUT_PUSHPULL); // LED 3
 
     ergodox_blink_all_leds();
-
-    matrix_init_user();
 }
 
 void ergodox_blink_all_leds(void)

keyboards/ergodox_stm32/matrix.c

@@ -33,13 +33,9 @@ __attribute__((weak)) void matrix_init_user(void) {}
 
 __attribute__((weak)) void matrix_scan_user(void) {}
 
-__attribute__((weak)) void matrix_init_kb(void) {
+__attribute__((weak)) void matrix_init_kb(void) {}
-  matrix_init_user();
-}
 
-__attribute__((weak)) void matrix_scan_kb(void) {
+__attribute__((weak)) void matrix_scan_kb(void) {}
-  matrix_scan_user();
-}
 
 void matrix_init(void) {
   mcp23017_status = init_mcp23017();

keyboards/ergoinu/ergoinu.c

@@ -1,5 +1 @@
 #include "ergoinu.h"
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};

keyboards/ergoinu/matrix.c

@@ -74,12 +74,10 @@ static uint8_t matrix_master_scan(void);
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-  matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/ergotaco/ergotaco.c

@@ -24,8 +24,6 @@ void matrix_init_kb(void) {
 
     DDRF  &= ~(1<<0 | 1<<1 | 1<<4 | 1<<6 | 1<<7);
     PORTF |=  (1<<0 | 1<<1 | 1<<4 | 1<<6 | 1<<7);
-
-    matrix_init_user();
 }
 
 

keyboards/ergotaco/matrix.c

@@ -74,14 +74,10 @@ __attribute__ ((weak))
 void matrix_scan_user(void) {}
 
 __attribute__ ((weak))
-void matrix_init_kb(void) {
+void matrix_init_kb(void) {}
-  matrix_init_user();
-}
 
 __attribute__ ((weak))
-void matrix_scan_kb(void) {
+void matrix_scan_kb(void) {}
-  matrix_scan_user();
-}
 
 inline
 uint8_t matrix_rows(void)

keyboards/ergotravel/rev1/rev1.c

@@ -1,22 +1 @@
 #include "rev1.h"
-
-
-#ifdef SSD1306OLED
-void led_set_kb(uint8_t usb_led) {
-    // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-    led_set_user(usb_led);
-}
-#endif
-
-void matrix_init_kb(void) {
-
-    // // green led on
-    // DDRD |= (1<<5);
-    // PORTD &= ~(1<<5);
-
-    // // orange led on
-    // DDRB |= (1<<0);
-    // PORTB &= ~(1<<0);
-
-	matrix_init_user();
-};

keyboards/evil80/evil80.c

@@ -3,14 +3,6 @@ void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
     led_init_ports();
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-    // put your looping keyboard code here
-    // runs every cycle (a lot)
-
-    matrix_scan_user();
 }
 
 void led_init_ports(void) {
@@ -35,6 +27,4 @@ void led_set_kb(uint8_t usb_led) {
     {
         PORTB &= ~(1<<7); // LO
     }
-
-    led_set_user(usb_led);
 }

keyboards/exclusive/e65/e65.c

@@ -20,7 +20,6 @@ void matrix_init_kb(void) {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
 
-    matrix_init_user();
     led_init_ports();
 }
 
@@ -30,9 +29,6 @@ void led_init_ports(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
+    writePin(B6, !led_state.caps_lock);
-        writePin(B6, !led_state.caps_lock);
-    }
-
     return true;
 }

keyboards/exclusive/e6_rgb/e6_rgb.c

@@ -8,7 +8,6 @@
 void matrix_init_kb(void) {
   setPinOutput(D5);
   writePinHigh(D5);
-  matrix_init_user();
 }
 
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {

keyboards/exclusive/e6v2/le/le.c

@@ -1,20 +1,6 @@
 #include "le.h"
 
-void matrix_init_kb(void) {
+void led_set_kb(uint8_t usb_led) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-void led_set_user(uint8_t usb_led) {
 	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
 		DDRB |= (1 << 7); 
 		PORTB &= ~(1 << 7);