Merge remote-tracking branch 'origin/master' into develop

6 files changed, 6 insertions, 24 deletions

diff --git a/quantum/serial_link/protocol/byte_stuffer.h b/quantum/serial_link/protocol/byte_stuffer.h
index 97e8968564..397ed3baae 100644
--- a/quantum/serial_link/protocol/byte_stuffer.h
+++ b/quantum/serial_link/protocol/byte_stuffer.h
@@ -22,8 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef SERIAL_LINK_BYTE_STUFFER_H
-#define SERIAL_LINK_BYTE_STUFFER_H
+#pragma once
 
 #include <stdint.h>
 
@@ -33,5 +32,3 @@ SOFTWARE.
 void init_byte_stuffer(void);
 void byte_stuffer_recv_byte(uint8_t link, uint8_t data);
 void byte_stuffer_send_frame(uint8_t link, uint8_t* data, uint16_t size);
-
-#endif
diff --git a/quantum/serial_link/protocol/frame_router.h b/quantum/serial_link/protocol/frame_router.h
index 712250ff35..9325fe4eed 100644
--- a/quantum/serial_link/protocol/frame_router.h
+++ b/quantum/serial_link/protocol/frame_router.h
@@ -22,8 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef SERIAL_LINK_FRAME_ROUTER_H
-#define SERIAL_LINK_FRAME_ROUTER_H
+#pragma once
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -34,5 +33,3 @@ SOFTWARE.
 void router_set_master(bool master);
 void route_incoming_frame(uint8_t link, uint8_t* data, uint16_t size);
 void router_send_frame(uint8_t destination, uint8_t* data, uint16_t size);
-
-#endif
diff --git a/quantum/serial_link/protocol/frame_validator.h b/quantum/serial_link/protocol/frame_validator.h
index 4a910d510b..0f78768a00 100644
--- a/quantum/serial_link/protocol/frame_validator.h
+++ b/quantum/serial_link/protocol/frame_validator.h
@@ -22,13 +22,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef SERIAL_LINK_FRAME_VALIDATOR_H
-#define SERIAL_LINK_FRAME_VALIDATOR_H
+#pragma once
 
 #include <stdint.h>
 
 void validator_recv_frame(uint8_t link, uint8_t* data, uint16_t size);
 // The buffer pointed to by the data needs 4 additional bytes
 void validator_send_frame(uint8_t link, uint8_t* data, uint16_t size);
-
-#endif
diff --git a/quantum/serial_link/protocol/physical.h b/quantum/serial_link/protocol/physical.h
index 425e06cdd2..399c9d1f76 100644
--- a/quantum/serial_link/protocol/physical.h
+++ b/quantum/serial_link/protocol/physical.h
@@ -22,9 +22,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef SERIAL_LINK_PHYSICAL_H
-#define SERIAL_LINK_PHYSICAL_H
+#pragma once
 
 void send_data(uint8_t link, const uint8_t* data, uint16_t size);
-
-#endif
diff --git a/quantum/serial_link/protocol/transport.h b/quantum/serial_link/protocol/transport.h
index 309a56b000..3ce0c9fe4e 100644
--- a/quantum/serial_link/protocol/transport.h
+++ b/quantum/serial_link/protocol/transport.h
@@ -22,8 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef SERIAL_LINK_TRANSPORT_H
-#define SERIAL_LINK_TRANSPORT_H
+#pragma once
 
 #include "serial_link/protocol/triple_buffered_object.h"
 #include "serial_link/system/serial_link.h"
@@ -138,5 +137,3 @@ void add_remote_objects(remote_object_t** remote_objects, uint32_t num_remote_ob
 void reinitialize_serial_link_transport(void);
 void transport_recv_frame(uint8_t from, uint8_t* data, uint16_t size);
 void update_transport(void);
-
-#endif
diff --git a/quantum/serial_link/protocol/triple_buffered_object.h b/quantum/serial_link/protocol/triple_buffered_object.h
index 6ec98d52bf..717d6d7b8b 100644
--- a/quantum/serial_link/protocol/triple_buffered_object.h
+++ b/quantum/serial_link/protocol/triple_buffered_object.h
@@ -22,8 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#ifndef SERIAL_LINK_TRIPLE_BUFFERED_OBJECT_H
-#define SERIAL_LINK_TRIPLE_BUFFERED_OBJECT_H
+#pragma once
 
 #include <stdint.h>
 
@@ -43,5 +42,3 @@ void triple_buffer_init(triple_buffer_object_t* object);
 void* triple_buffer_begin_write_internal(uint16_t object_size, triple_buffer_object_t* object);
 void  triple_buffer_end_write_internal(triple_buffer_object_t* object);
 void* triple_buffer_read_internal(uint16_t object_size, triple_buffer_object_t* object);
-
-#endif