wip

keyboards/kbdfans/kbd6x/kbd6x.c

@@ -15,20 +15,6 @@
  */
 #include "kbd6x.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) {
 	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
 		DDRB |= (1 << 6); 
@@ -37,6 +23,4 @@ void led_set_kb(uint8_t usb_led) {
 		DDRB &= ~(1 << 6); 
 		PORTB &= ~(1 << 6);
 	}
-	
-	led_set_user(usb_led);
 }

keyboards/kbdfans/kbd75/rev1/rev1.c

@@ -7,11 +7,8 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(B2);
   }
-
-  led_set_user(usb_led);
 }
 
 void matrix_init_kb(void) {
   setPinOutput(B2);
-  matrix_init_user();
 }

keyboards/kbdfans/kbd75/rev2/rev2.c

@@ -7,11 +7,8 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(B2);
   }
-
-  led_set_user(usb_led);
 }
 
 void matrix_init_kb(void) {
   setPinOutput(B2);
-  matrix_init_user();
 }

keyboards/kbdfans/kbd8x/kbd8x.c

@@ -23,20 +23,6 @@ extern inline void num_led_on(void);
 extern inline void scroll_led_off(void);
 extern inline void scroll_led_on(void);
 
-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
 
@@ -60,6 +46,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         scroll_led_off();
     }
-
-	led_set_user(usb_led);
 }

keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c

@@ -24,8 +24,6 @@ void matrix_init_kb(void) {
   
   setPinOutput(B2);
   setPinOutput(E6);
-
-  matrix_init_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -44,21 +42,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(B2);
   }
-
-  led_set_user(usb_led);
 }
-
-// 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_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-*/

keyboards/kbdfans/kbdmini/kbdmini.c

@@ -74,20 +74,12 @@ led_config_t g_led_config = { {
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
 } };
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
 void suspend_power_down_kb(void)
 {
     rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
 }
 
 void suspend_wakeup_init_kb(void)
 {
     rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
 }

keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c

@@ -21,8 +21,6 @@ void matrix_init_kb(void) {
   // Sinking setup (5V -> LED/Res -> Pin)
   
   setPinOutput(B4);
-
-  matrix_init_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -34,21 +32,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinHigh(B4);
   }
-
-  led_set_user(usb_led);
 }
-
-// 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_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-*/

keyboards/kc60se/kc60se.c

@@ -16,15 +16,8 @@
 
 #include QMK_KEYBOARD_H
 
-void matrix_init_kb(void){
-    setPinOutput(B2);
-}
-
 bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
     writePin(B2, !led_state.caps_lock);
-    }
+    return true;
-    return res;
 }
 

keyboards/keebio/ergodicity/ergodicity.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ergodicity.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/keebio/levinson/rev1/rev1.c

@@ -1,22 +1 @@
 #include "levinson.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/keebio/levinson/rev2/rev2.c

@@ -1,22 +1 @@
 #include "levinson.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/keebio/levinson/rev3/rev3.c

@@ -1,22 +1 @@
 #include "levinson.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/keebio/nyquist/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/keebio/nyquist/rev2/rev2.c

@@ -1,21 +1 @@
 #include "rev2.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/keebio/nyquist/rev3/rev3.c

@@ -1,21 +1 @@
 #include "rev3.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/keebio/quefrency/rev1/rev1.c

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

keyboards/keebio/rorschach/rev1/rev1.c

@@ -1,14 +1 @@
 #include "rev1.h"
-
-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/keebio/tragicforce68/tragicforce68.c

@@ -1,8 +1 @@
 #include "tragicforce68.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}

keyboards/keebio/wavelet/wavelet.c

@@ -1,18 +1,5 @@
 #include "wavelet.h"
 
-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();
-};
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {

keyboards/keyhive/maypad/maypad.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "maypad.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/kinesis/alvicstep/alvicstep.c

@@ -67,20 +67,10 @@ void blink_all_leds(void)
 
  void matrix_init_kb(void) {
 	  blink_all_leds();
-	  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
-
 //Copyright 2014 Warren Janssens <warren.janssens@gmail.com>
    uint8_t leds = 0xF0;
     if (usb_led & 1 << USB_LED_NUM_LOCK)
@@ -90,9 +80,6 @@ void led_set_kb(uint8_t usb_led) {
     if (usb_led & 1 << USB_LED_SCROLL_LOCK)
         leds &= ~0x20;
     PORTD = (PORTD & 0x0F) | leds;
-
-	led_set_user(usb_led);
-
 }
 
 

keyboards/kinesis/alvicstep/matrix.c

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

keyboards/kinesis/stapelberg/stapelberg.c

@@ -8,15 +8,6 @@ void matrix_init_kb(void) {
     DDRF |= (1<<1); // ScrLock LED
     DDRF |= (1<<2); // NumLock LED
     DDRF |= (1<<3); // CapsLock LED
-
-	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() {

keyboards/kira75/kira75.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kira75.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/kmac/kmac.c

@@ -29,21 +29,8 @@ void matrix_init_kb(void) {
     // runs once when the firmware starts up
     setPinOutput(CAPS_PIN);
     setPinOutput(SCROLL_PIN);
-
-    matrix_init_user();
 }
 
-/*
-
-void matrix_scan_kb(void) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
-*/
-
 /* LED pin configuration
  * Scroll Lock: Low PE6
  * Caps Lock: Low PB0
@@ -60,8 +47,6 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         writePinHigh(SCROLL_PIN);
     }
-
-    led_set_user(usb_led);
 }
 
 void backlight_init_ports(void) {

keyboards/kmac/matrix.c

@@ -48,13 +48,9 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 static matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
 static matrix_row_t matrix[MATRIX_ROWS];      // debounced values
 
-__attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); }
+__attribute__((weak)) void matrix_init_kb(void) {}
 
-__attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); }
+__attribute__((weak)) void matrix_scan_kb(void) {}
-
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
-
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
 
 __attribute__((weak)) void matrix_init_user(void) {}
 

keyboards/kmini/kmini.c

@@ -19,14 +19,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) {
@@ -40,7 +32,3 @@ void led_init_ports(void) {
  * Side1: Low B3
  * Side2: Low B2
  */
-void led_set_kb(uint8_t usb_led) {
-    led_set_user(usb_led);
-}
-

keyboards/kmini/matrix.c

@@ -55,14 +55,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/knops/mini/mini.c

@@ -14,24 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mini.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/kona_classic/kona_classic.c

@@ -14,25 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kona_classic.h"
-
-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) {
-//    DDRB |= (1<<6) | (1<<7); // OUT
-}
-
-void led_set_kb(uint8_t usb_led) {
-//    led_set_user(usb_led);
-}

keyboards/kudox/rev1/rev1.c

@@ -1,22 +1 @@
 #include "kudox.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/kudox_game/rev1/rev1.c

@@ -1,22 +1 @@
 #include "kudox_game.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/kv/revt/revt.c

@@ -20,6 +20,4 @@ void matrix_init_kb(void) {
   // Turn status LED on
   setPinOutput(C14);
   writePinHigh(C14);
-
-  matrix_init_user();
 }

keyboards/launchpad/rev1/rev1.c

@@ -1,9 +1 @@
 #include "launchpad.h"
-
-void matrix_init_kb(void) {
-	// Undo init of RX LED, we use that port currently
-	//DDRB &= ~(1<<0);
-	
-	matrix_init_user();
-	
-};

keyboards/lets_split/rev1/rev1.c

@@ -1,15 +1 @@
 #include "lets_split.h"
-
-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/lets_split/rev2/rev2.c

@@ -1,23 +1 @@
 #include "lets_split.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/lets_split/sockets/sockets.c

@@ -1,22 +1 @@
 #include "lets_split.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/lfkeyboards/lfk65_hs/lfk65_hs.c

@@ -4,27 +4,10 @@
 #include "lfk65_hs.h"
 #include "keymap.h"
 
-void matrix_init_kb(void)
-{
-    matrix_init_user();
-
-}
-
-void matrix_scan_kb(void)
-{
-    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.
-     */
     if (keycode == RESET) {
         reset_keyboard_kb();
-    } else {
     }
     return true;
 }

keyboards/lfkeyboards/lfk78/lfk78.c

@@ -24,8 +24,6 @@ const Layer_Info layer_info[] = {
 
 void matrix_init_kb(void)
 {
-    matrix_init_user();
-
     // Configure the Layer LED
     // Set up 16 bit PWM: Fast PWM, mode 15, inverted
     TCCR1A = 0b11111110;
@@ -102,7 +100,6 @@ void matrix_scan_kb(void)
             }
         }
     }
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration){
@@ -119,11 +116,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.
-     */
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
@@ -223,7 +215,6 @@ void led_set_kb(uint8_t usb_led)
     }
 #endif // CAPSLOCK_LED
 #endif // ISS_ENABLE
-    led_set_user(usb_led);
 }
 
 // LFK lighting info

keyboards/lfkeyboards/lfk87/lfk87.c

@@ -27,7 +27,6 @@ void matrix_init_kb(void)
 {
     // put your keyboard start-up code here
     // runs once when the firmware starts up
-    matrix_init_user();
     set_rgb(31, 0x00, 0x00, 0x00);  // Caps lock
     set_rgb(32, 0xFF, 0x00, 0x00);  // Layer indicator, start red
 #ifndef AUDIO_ENABLE
@@ -89,7 +88,6 @@ void matrix_scan_kb(void)
             }
         }
     }
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration){
@@ -106,11 +104,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.
-     */
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
@@ -196,7 +189,6 @@ void led_set_kb(uint8_t usb_led)
     }else{
         set_rgb(31, 0x00, 0x00, 0x00);
     }
-    led_set_user(usb_led);
 }
 
 // Lighting info, see lighting.h for details

keyboards/lfkeyboards/lfkpad/lfkpad.c

@@ -13,8 +13,6 @@ uint16_t click_time = CLICK_MS;
 uint8_t click_toggle = CLICK_ENABLED;
 
 void matrix_init_kb(void) {
-    matrix_init_user();
-
 #ifndef AUDIO_ENABLE
     // If we're not using the audio pin, drive it low
     setPinOutput(C6);
@@ -64,8 +62,6 @@ void matrix_scan_kb(void) {
         twi_last_ready++;
     }
 #endif
-
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration) {
@@ -83,11 +79,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.
-     */
     if (click_toggle && record->event.pressed) {
         click(click_hz, click_time);
     }

keyboards/lfkeyboards/mini1800/mini1800.c

@@ -30,9 +30,6 @@ const Layer_Info layer_info[] = {
 
 void matrix_init_kb(void)
 {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
     set_rgb(31, 0x00, 0x00, 0x00);  // Caps lock
     set_rgb(32, 0xFF, 0x00, 0x00);  // Layer indicator, start red
 #ifndef AUDIO_ENABLE
@@ -95,7 +92,6 @@ void matrix_scan_kb(void)
             }
         }
     }
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration){
@@ -112,11 +108,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.
-     */
     if (click_toggle && record->event.pressed){
         click(click_hz, click_time);
     }
@@ -205,7 +196,6 @@ void led_set_kb(uint8_t usb_led)
     }else{
         set_rgb(31, 0x00, 0x00, 0x00);
     }
-    led_set_user(usb_led);
 }
 
 // Lighting info, see lighting.h for details

keyboards/lfkeyboards/smk65/smk65.c

@@ -15,8 +15,6 @@ uint8_t click_toggle = CLICK_ENABLED;
 
 void matrix_init_kb(void)
 {
-    matrix_init_user();
-
 #ifdef AUDIO_ENABLE
     // audio_init() sets PB5 to output and drives it low, which breaks our matrix
     // so reset PB5 to input
@@ -38,7 +36,6 @@ void matrix_scan_kb(void)
 #ifdef WATCHDOG_ENABLE
     wdt_reset();
 #endif
-    matrix_scan_user();
 }
 
 void click(uint16_t freq, uint16_t duration){
@@ -55,11 +52,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){
@@ -137,13 +129,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/lily58/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/m0lly/m0lly.c

@@ -20,14 +20,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) {
@@ -37,7 +29,6 @@ void led_init_ports(void) {
 }
 
 void led_set_kb(uint8_t usb_led) {
-//    led_set_user(usb_led);
     if (usb_led & (1<<USB_LED_NUM_LOCK)) {
         // Turn numlock on
 		PORTD |= (1<<2);

keyboards/m10a/m10a.c

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

keyboards/maartenwut/atom47/rev2/rev2.c

@@ -4,16 +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) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
 void led_init_ports(void) {
     // * Set our LED pins as output
     DDRB &= ~(1<<5);
@@ -30,5 +23,4 @@ void led_set_kb(uint8_t usb_led) {
         // Turn capslock off
         PORTF &= ~(1<<5);
     }
-	led_set_user(usb_led);
 }

keyboards/maartenwut/atom47/rev3/rev3.c

@@ -4,16 +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) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
 void led_init_ports(void) {
     // * Set our LED pins as output
     DDRE |= (1 << 6);
@@ -21,7 +14,3 @@ void led_init_ports(void) {
 	//Set output high, so the capslock led is off
 	PORTE |= (1 << 6);
 }
-
-void led_set_kb(uint8_t usb_led) {
-    led_set_user(usb_led);
-}

keyboards/maartenwut/minitomic/minitomic.c

@@ -19,25 +19,15 @@ 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) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-    matrix_scan_user();
-}
-
 void led_init_ports(void) {
 	//Set led pin as output, then high (off)
     writePinHigh(C7);
 }
 
 bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
     // writePin sets the pin high for 1 and low for 0.
     // In this example the pins are inverted, setting
     // it low/0 turns it on, and high/1 turns the LED off.
@@ -45,6 +35,4 @@ bool led_update_kb(led_t led_state) {
     // and VCC or the pin and GND.
     writePin(C7, !led_state.caps_lock);
 }
-    return res;
-}
 

keyboards/maartenwut/mx5160/mx5160.c

@@ -20,17 +20,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) {
-  // put your looping keyboard code here
-  // runs every cycle (a lot)
-
-  matrix_scan_user();
-}
-
 void led_init_ports(void) {
 	//Set led pin as output, then high (off)
 	
@@ -48,11 +40,8 @@ void led_init_ports(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if (res) {
     writePin(B2, !led_state.num_lock);
     writePin(B1, !led_state.caps_lock);
     writePin(B3, !led_state.scroll_lock);
-    }
+    return true;
-    return res;
 }

keyboards/maartenwut/ta65/ta65.c

@@ -1,13 +1 @@
 #include "ta65.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();
-};

keyboards/maartenwut/wasdat/wasdat.c

@@ -15,15 +15,7 @@
  */
 #include "wasdat.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();
     led_init_ports();
 }
 
@@ -37,11 +29,8 @@ void led_init_ports(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
     writePin(B0, !led_state.caps_lock);
     writePin(B1, !led_state.scroll_lock);
     writePin(B2, !led_state.num_lock);
-    }
-
     return true;
 }

keyboards/maartenwut/wonderland/wonderland.c

@@ -4,17 +4,9 @@ __attribute__ ((weak))
 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();
 };
 
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
 __attribute__ ((weak))
 void led_init_ports(void) {
     // * Set our LED pins as output
@@ -24,11 +16,8 @@ void led_init_ports(void) {
 }
 
 bool led_update_kb(led_t led_state) {
-    bool runDefault = led_update_user(led_state);
-    if (runDefault) {
     writePin(B1, !led_state.num_lock);
     writePin(B2, !led_state.caps_lock);
     writePin(B3, !led_state.scroll_lock);
-    }
+    return true;
-    return runDefault;
 }

keyboards/massdrop/alt/matrix.c

@@ -34,12 +34,10 @@ uint32_t row_masks[2]; //NOTE: If more than PA PB used in the future, adjust cod
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/massdrop/ctrl/matrix.c

@@ -34,12 +34,10 @@ uint32_t row_masks[2]; //NOTE: If more than PA PB used in the future, adjust cod
 
 __attribute__ ((weak))
 void matrix_init_kb(void) {
-    matrix_init_user();
 }
 
 __attribute__ ((weak))
 void matrix_scan_kb(void) {
-    matrix_scan_user();
 }
 
 __attribute__ ((weak))

keyboards/matrix/noah/noah.c

@@ -50,13 +50,7 @@ void rgblight_set(void) {
 }
 #endif
 
-void matrix_scan_kb(void) { matrix_scan_user(); }
-
 void matrix_init_kb(void) {
-  matrix_init_user();
-}
-__attribute__((weak))
-void matrix_init_user(void) {
 #ifdef RGBLIGHT_ENABLE
   rgblight_enable();
 #endif
@@ -66,8 +60,7 @@ void matrix_init_user(void) {
 #endif
 }
 
-__attribute__((weak))
+void matrix_scan_kb(void) {
-void matrix_scan_user(void) {
 #ifdef RGBLIGHT_ENABLE
   rgblight_task();
 #endif

keyboards/maxr1998/pulse4k/pulse4k.c

@@ -30,10 +30,6 @@ combo_t key_combos[COMBO_COUNT] = {
 
 bool led_adjust_active = false;
 
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
 void process_combo_event(uint8_t combo_index, bool pressed) {
     if (combo_index == LED_ADJUST) {
         led_adjust_active = pressed;

keyboards/mechkeys/mk60/mk60.c

@@ -19,15 +19,6 @@ void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
 	setPinOutput(B7);
-
-	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) {
@@ -38,6 +29,4 @@ void led_set_kb(uint8_t usb_led) {
 	}else {
 		writePinHigh(B7);
 	}
-
-	led_set_user(usb_led);
 }

keyboards/mechlovin/hannah910/hannah910.c

@@ -16,7 +16,6 @@
 #include "hannah910.h"
 
 void matrix_init_kb(void) {
-  matrix_init_user();
   led_init_ports();
 };
 void led_init_ports(void) {
@@ -32,10 +31,9 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinLow(B2);
   }
-      led_set_user(usb_led);
 }
 
-uint32_t layer_state_set_user(uint32_t state)
+uint32_t layer_state_set_kb(uint32_t state)
 {
   // if on layer 1, turn on D2 LED, otherwise off.
     if (biton32(state) == 1) {
@@ -57,5 +55,5 @@ uint32_t layer_state_set_user(uint32_t state)
         writePinLow(D0);
     }
 
-    return state;
+    return layer_state_set_user(state);
 }

keyboards/mechlovin/infinityce/infinityce.c

@@ -19,7 +19,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();
 };
 
@@ -27,9 +26,8 @@ void led_init_ports(void) {
     // * Set our LED pins as output
     setPinOutput(B3);
 }
+
 bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
     writePin(B3, led_state.caps_lock);
     rgblight_set_effect_range(1, 30);
     if (led_state.scroll_lock) {
@@ -37,6 +35,5 @@ bool led_update_kb(led_t led_state) {
     } else {
         rgblight_setrgb_at(0, 0, 0, 0);
     }
-    }
+    return true;
-    return res;
 }

keyboards/meira/matrix.c

@@ -78,12 +78,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/meira/meira.c

@@ -36,10 +36,6 @@ void matrix_init_kb(void)
     // we should get a flashing red light
     wdt_enable(WDTO_500MS);
 #endif
-
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
 }
 
 void matrix_scan_kb(void)
@@ -71,29 +67,17 @@ void matrix_scan_kb(void)
         twi_last_ready++;
     }
 #endif
-    matrix_scan_user();
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     // 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);
-    /* 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.
-     */
     if (keycode == RESET) {
         reset_keyboard_kb();
-    } else {
     }
     return true;
 }
 
-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 reset_keyboard_kb(){
 #ifdef WATCHDOG_ENABLE
     MCUSR = 0;

keyboards/meishi/meishi.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "meishi.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/meishi2/meishi2.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "meishi2.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/meme/meme.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "meme.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/meson/meson.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "meson.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/miniaxe/miniaxe.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "miniaxe.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/mitosis/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/mitosis/mitosis.c

@@ -14,7 +14,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/miuni32/miuni32.c

@@ -1,21 +1 @@
 #include "miuni32.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/model01/model01.c

@@ -21,18 +21,7 @@
 void matrix_init_kb(void) {
   /* the bootloader can leave LEDs on, so */
   set_all_leds_to(0, 0, 0);
-  matrix_init_user();
 }
 
 void matrix_scan_kb(void) {
-  matrix_scan_user();
 }
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-

keyboards/moon/matrix.c

@@ -98,9 +98,9 @@ __attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); }
 
 __attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); }
 
-__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) {}
 
 __attribute__((weak)) void matrix_init_user(void) {}
 

keyboards/moon/moon.c

@@ -28,21 +28,8 @@ void matrix_init_kb(void) {
 
   setPinOutput(CAPS_PIN);
   setPinOutput(SCROLL_PIN);
-
-  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
 
@@ -57,6 +44,4 @@ void led_set_kb(uint8_t usb_led) {
   } else {
     writePinLow(SCROLL_PIN);
   }
-
-  led_set_user(usb_led);
 }

keyboards/mxss/mxss.c

@@ -35,15 +35,6 @@ void matrix_init_kb(void) {
     fled_init();
     via_eeprom_set_valid(true);
 #endif // VIA_ENABLE
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
@@ -54,7 +45,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 
 bool led_update_kb(led_t led_state) {
     fled_lock_update(led_state);
-	return led_update_user(led_state);
+    return true;
 }
 
 layer_state_t layer_state_set_kb(layer_state_t state) {

keyboards/nafuda/nafuda.c

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

keyboards/naked48/rev1/rev1.c

@@ -1,12 +1,5 @@
 #include "naked48.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*/
-
 #ifdef RGB_MATRIX_ENABLE
     led_config_t g_led_config = { {
     // Key Matrix to LED Index
@@ -30,7 +23,3 @@ void led_set_kb(uint8_t usb_led) {
         4, 4, 4, 4, 4, 4, 4, 4
 } };
 #endif
-
-void matrix_init_kb(void) {
-	matrix_init_user();
-};

keyboards/naked60/rev1/rev1.c

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

keyboards/naked64/rev1/rev1.c

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

keyboards/namecard2x4/namecard2x4.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "namecard2x4.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/navi10/rev0/rev0.c

@@ -16,15 +16,9 @@
 #include "rev0.h"
 
 void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
   //set the indicator LED pin to Output
   setPinOutput(B5);
   //set HIGH for off.
   writePinHigh(B5);
-
-  //call any user functions
-  matrix_init_user();
 }
 

keyboards/navi10/rev2/rev2.c

@@ -16,15 +16,9 @@
 #include "rev2.h"
 
 void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
   //set the indicator LED pin to Output
   setPinOutput(B5);
   //set HIGH for off.
   writePinHigh(B5);
-
-  //call any user functions
-  matrix_init_user();
 }
 

keyboards/navi10/rev3/rev3.c

@@ -16,15 +16,9 @@
 #include "rev3.h"
 
 void matrix_init_kb(void) {
-  // put your keyboard start-up code here
-  // runs once when the firmware starts up
-
   //set the indicator LED pin to Output
   setPinOutput(B5);
   //set HIGH for off.
   writePinHigh(B5);
-
-  //call any user functions
-  matrix_init_user();
 }
 

keyboards/nek_type_a/matrix.c

@@ -107,12 +107,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/nek_type_a/nek_type_a.c

@@ -14,23 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "nek_type_a.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/newgame40/newgame40.c

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

keyboards/nightmare/nightmare.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "nightmare.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/niu_mini/niu_mini.c

@@ -14,6 +14,4 @@ void matrix_init_kb(void) {
     // Turn status LED on
     setPinOutput(E6);
     writePinHigh(E6);
-
-    matrix_init_user();
 }

keyboards/noxary/220/220.c

@@ -23,33 +23,12 @@ void matrix_init_kb(void) {
   // put your keyboard start-up code here
   // runs once when the firmware starts up
   setPinOutput(C6);
-  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 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_NUM_LOCK)) {
     writePinLow(C6);
   } else {
     writePinHigh(C6);
   }
-	led_set_user(usb_led);
 }

keyboards/noxary/260/260.c

@@ -21,34 +21,13 @@
 
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
   setPinOutput(B1);
-	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 led_set_kb(uint8_t usb_led) {
   if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
     writePinLow(B1);
   } else {
     writePinHigh(B1);
   }
-
-	led_set_user(usb_led);
 }

keyboards/noxary/280/280.c

@@ -21,17 +21,12 @@
 
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
   setPinOutput(D5);
   setPinOutput(D0);
-	matrix_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
-    if(led_update_user(led_state)) {
     writePin(D5, led_state.caps_lock);
     writePin(D0, led_state.scroll_lock);
-    }
     return true;
 }

keyboards/noxary/x268/x268.c

@@ -15,32 +15,10 @@
  */
 #include "x268.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);
-}
-
-void led_set_user(uint8_t usb_led) {
-
     if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
         DDRB |= (1 << 0); PORTB |= (1 << 0);
-    }
+    } else {
-    else {
         DDRB &= ~(1 << 0); PORTB &= ~(1 << 0);
     }
 }

keyboards/orthodox/rev1/rev1.c

@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "orthodox.h"
 
-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();
-};
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap

keyboards/orthodox/rev3/rev3.c

@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "orthodox.h"
 
-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();
-};
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap

keyboards/orthodox/rev3_teensy/rev3_teensy.c

@@ -21,19 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "orthodox.h"
 
-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();
-};
-
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
 // swap-hands action needs a matrix to define the swap

keyboards/otaku_split/rev0/rev0.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rev0.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/otaku_split/rev1/rev1.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rev1.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/pdxkbc/pdxkbc.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "pdxkbc.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/peiorisboards/ixora/ixora.c

@@ -1,21 +1,12 @@
 #include "ixora.h"
 
 void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
     setPinOutput(A8);
     setPinOutput(A9);
     setPinOutput(A10);
     writePinLow(A8);
     writePinLow(A9);
     writePinLow(A10);
-
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-
-    matrix_scan_user();
 }
 
 void led_set_kb(uint8_t usb_led) {
@@ -34,5 +25,4 @@ void led_set_kb(uint8_t usb_led) {
     } else {
         writePinLow(A8);
     }
-    led_set_user(usb_led);
 }

keyboards/percent/booster/booster.c

@@ -14,31 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "booster.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/phantom/phantom.c

@@ -16,17 +16,7 @@
 #include "phantom.h"
 
 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) {
@@ -51,6 +41,4 @@ void led_set_kb(uint8_t usb_led) {
     {
         PORTB &= ~(1<<7); // LO
     }
-
-    led_set_user(usb_led);
 }