From 567da49ed027a936a6f56aa069aad0db4605a198 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 24 Jul 2021 12:13:06 +0100
Subject: [PATCH] Avoid LTO conficts on arm_atsam (#13676)

---
 quantum/split_common/split_util.c    | 2 +-
 tmk_core/common/usb_util.c           | 2 +-
 tmk_core/common/usb_util.h           | 2 +-
 tmk_core/protocol/chibios/usb_util.c | 2 +-
 tmk_core/protocol/lufa/usb_util.c    | 2 +-
 tmk_core/protocol/vusb/usb_util.c    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 989829d2dc5f51e289b7d4525bea02b530778722..8d414f6fe6b95c35559a82a380bcd2e5ad5e2dc3 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -106,7 +106,7 @@ __attribute__((weak)) bool is_keyboard_master(void) {
 
         // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow
         if (usbstate == SLAVE) {
-            usb_disable();
+            usb_disconnect();
         }
     }
 
diff --git a/tmk_core/common/usb_util.c b/tmk_core/common/usb_util.c
index d4134a04465ecaa106ad1a8f59d7e4b3b1296f22..dd1deeaa112382cfbdfacc7a65a70ec9117a1a03 100644
--- a/tmk_core/common/usb_util.c
+++ b/tmk_core/common/usb_util.c
@@ -16,7 +16,7 @@
 #include "quantum.h"
 #include "usb_util.h"
 
-__attribute__((weak)) void usb_disable(void) {}
+__attribute__((weak)) void usb_disconnect(void) {}
 __attribute__((weak)) bool usb_connected_state(void) { return true; }
 __attribute__((weak)) bool usb_vbus_state(void) {
 #ifdef USB_VBUS_PIN
diff --git a/tmk_core/common/usb_util.h b/tmk_core/common/usb_util.h
index 4ebedb1e71f88ea55c81f0d08680ceda34f29fc2..13db9fbfbdfbc2d14ab8df9f5f09aeabe9b963f2 100644
--- a/tmk_core/common/usb_util.h
+++ b/tmk_core/common/usb_util.h
@@ -17,6 +17,6 @@
 
 #include <stdbool.h>
 
-void usb_disable(void);
+void usb_disconnect(void);
 bool usb_connected_state(void);
 bool usb_vbus_state(void);
diff --git a/tmk_core/protocol/chibios/usb_util.c b/tmk_core/protocol/chibios/usb_util.c
index 5945e8a8de6fbe3f4cd6158d2c50bb5a2c0b0760..e32d6ebfa4d797d47558dfd5fa63004062d9af45 100644
--- a/tmk_core/protocol/chibios/usb_util.c
+++ b/tmk_core/protocol/chibios/usb_util.c
@@ -16,6 +16,6 @@
 #include <hal.h>
 #include "usb_util.h"
 
-void usb_disable(void) { usbStop(&USBD1); }
+void usb_disconnect(void) { usbStop(&USBD1); }
 
 bool usb_connected_state(void) { return usbGetDriverStateI(&USBD1) == USB_ACTIVE; }
diff --git a/tmk_core/protocol/lufa/usb_util.c b/tmk_core/protocol/lufa/usb_util.c
index 9e943a21b97c87417f2c356a54031b7bb93dafe2..9691eff1e4d2a7106719de502af2fd232b634bf9 100644
--- a/tmk_core/protocol/lufa/usb_util.c
+++ b/tmk_core/protocol/lufa/usb_util.c
@@ -17,7 +17,7 @@
 #include "usb_util.h"
 #include "wait.h"
 
-void usb_disable(void) {
+void usb_disconnect(void) {
     USB_Disable();
     USB_DeviceState = DEVICE_STATE_Unattached;
 }
diff --git a/tmk_core/protocol/vusb/usb_util.c b/tmk_core/protocol/vusb/usb_util.c
index 602854dbe6f3537f813058071ae866f3d21b6ec5..4ee2d3188b32bb27b6e9014025f3caef56f682da 100644
--- a/tmk_core/protocol/vusb/usb_util.c
+++ b/tmk_core/protocol/vusb/usb_util.c
@@ -16,7 +16,7 @@
 #include <usbdrv/usbdrv.h>
 #include "usb_util.h"
 
-void usb_disable(void) { usbDeviceDisconnect(); }
+void usb_disconnect(void) { usbDeviceDisconnect(); }
 
 bool usb_connected_state(void) {
     usbPoll();