diff --git a/include/libopencm3/cm3/scb.h b/include/libopencm3/cm3/scb.h
index 0bc4e08f..024a8e17 100644
--- a/include/libopencm3/cm3/scb.h
+++ b/include/libopencm3/cm3/scb.h
@@ -173,7 +173,8 @@
 
 /* Bits [31:30]: reserved - must be kept cleared */
 /* TBLOFF[29:9]: Vector table base offset field */
-#define SCB_VTOR_TBLOFF_LSB			9	/* inconsistent datasheet - LSB could be 11 */
+/* inconsistent datasheet - LSB could be 11 */
+#define SCB_VTOR_TBLOFF_LSB			9
 
 /* --- SCB_AIRCR values ---------------------------------------------------- */
 
diff --git a/include/libopencm3/efm32/efm32lg/doc-efm32lg.h b/include/libopencm3/efm32/efm32lg/doc-efm32lg.h
index cea52e5d..7721239f 100644
--- a/include/libopencm3/efm32/efm32lg/doc-efm32lg.h
+++ b/include/libopencm3/efm32/efm32lg/doc-efm32lg.h
@@ -21,7 +21,8 @@ LGPL License Terms @ref lgpl_license
 
 /** @defgroup EFM32LG_defines EFM32 Leopard Gecko Defines
 
-@brief Defined Constants and Types for the Energy Micro EFM32 Leopard Gecko series
+@brief Defined Constants and Types for the Energy Micro EFM32 Leopard Gecko
+series
 
 @version 1.0.0
 
diff --git a/include/libopencm3/lm4f/gpio.h b/include/libopencm3/lm4f/gpio.h
index ea11986a..25addcc4 100644
--- a/include/libopencm3/lm4f/gpio.h
+++ b/include/libopencm3/lm4f/gpio.h
@@ -217,8 +217,8 @@ enum gpio_trigger {
 BEGIN_DECLS
 
 void gpio_enable_ahb_aperture(void);
-void gpio_mode_setup(uint32_t gpioport, enum gpio_mode mode, enum gpio_pullup pullup,
-		     uint8_t gpios);
+void gpio_mode_setup(uint32_t gpioport, enum gpio_mode mode,
+		     enum gpio_pullup pullup, uint8_t gpios);
 void gpio_set_output_config(uint32_t gpioport, enum gpio_output_type otype,
 			    enum gpio_drive_strength drive, uint8_t gpios);
 void gpio_set_af(uint32_t gpioport, uint8_t alt_func_num, uint8_t gpios);
@@ -319,7 +319,8 @@ static inline uint8_t gpio_port_read(uint32_t gpioport)
 /**
  * \brief Set level of of all pins from a port (atomic)
  *
- * Set the level of all pins on the given GPIO port. This is an atomic operation.
+ * Set the level of all pins on the given GPIO port. This is an atomic
+ * operation.
  *
  * This is functionally identical to @ref gpio_write (gpioport, GPIO_ALL, data).
  *
@@ -335,7 +336,8 @@ static inline void gpio_port_write(uint32_t gpioport, uint8_t data)
 }
 /** @} */
 
-void gpio_configure_trigger(uint32_t gpioport, enum gpio_trigger trigger, uint8_t gpios);
+void gpio_configure_trigger(uint32_t gpioport, enum gpio_trigger trigger,
+			    uint8_t gpios);
 void gpio_enable_interrupts(uint32_t gpioport, uint8_t gpios);
 void gpio_disable_interrupts(uint32_t gpioport, uint8_t gpios);
 
diff --git a/include/libopencm3/stm32/can.h b/include/libopencm3/stm32/can.h
index 80c3009b..2f969a79 100644
--- a/include/libopencm3/stm32/can.h
+++ b/include/libopencm3/stm32/can.h
@@ -646,26 +646,31 @@ BEGIN_DECLS
 
 void can_reset(uint32_t canport);
 int can_init(uint32_t canport, bool ttcm, bool abom, bool awum, bool nart,
-	     bool rflm, bool txfp, uint32_t sjw, uint32_t ts1, uint32_t ts2, uint32_t brp,
-	     bool loopback, bool silent);
+	     bool rflm, bool txfp, uint32_t sjw, uint32_t ts1, uint32_t ts2,
+	     uint32_t brp, bool loopback, bool silent);
 
-void can_filter_init(uint32_t canport, uint32_t nr, bool scale_32bit, bool id_list_mode,
-		     uint32_t fr1, uint32_t fr2, uint32_t fifo, bool enable);
-void can_filter_id_mask_16bit_init(uint32_t canport, uint32_t nr, uint16_t id1, uint16_t mask1,
-				   uint16_t id2, uint16_t mask2, uint32_t fifo, bool enable);
-void can_filter_id_mask_32bit_init(uint32_t canport, uint32_t nr, uint32_t id, uint32_t mask,
-				   uint32_t fifo, bool enable);
-void can_filter_id_list_16bit_init(uint32_t canport, uint32_t nr, uint16_t id1, uint16_t id2,
-				   uint16_t id3, uint16_t id4, uint32_t fifo, bool enable);
-void can_filter_id_list_32bit_init(uint32_t canport, uint32_t nr, uint32_t id1, uint32_t id2,
+void can_filter_init(uint32_t canport, uint32_t nr, bool scale_32bit,
+		     bool id_list_mode, uint32_t fr1, uint32_t fr2,
+		     uint32_t fifo, bool enable);
+void can_filter_id_mask_16bit_init(uint32_t canport, uint32_t nr, uint16_t id1,
+				   uint16_t mask1, uint16_t id2,
+				   uint16_t mask2, uint32_t fifo, bool enable);
+void can_filter_id_mask_32bit_init(uint32_t canport, uint32_t nr, uint32_t id,
+				   uint32_t mask, uint32_t fifo, bool enable);
+void can_filter_id_list_16bit_init(uint32_t canport, uint32_t nr, uint16_t id1,
+				   uint16_t id2, uint16_t id3, uint16_t id4,
 				   uint32_t fifo, bool enable);
+void can_filter_id_list_32bit_init(uint32_t canport, uint32_t nr, uint32_t id1,
+				   uint32_t id2, uint32_t fifo, bool enable);
 
 void can_enable_irq(uint32_t canport, uint32_t irq);
 void can_disable_irq(uint32_t canport, uint32_t irq);
 
-int can_transmit(uint32_t canport, uint32_t id, bool ext, bool rtr, uint8_t length, uint8_t *data);
-void can_receive(uint32_t canport, uint8_t fifo, bool release, uint32_t *id, bool *ext,
-		 bool *rtr, uint32_t *fmi, uint8_t *length, uint8_t *data);
+int can_transmit(uint32_t canport, uint32_t id, bool ext, bool rtr,
+		 uint8_t length, uint8_t *data);
+void can_receive(uint32_t canport, uint8_t fifo, bool release, uint32_t *id,
+		 bool *ext, bool *rtr, uint32_t *fmi, uint8_t *length,
+		 uint8_t *data);
 
 void can_fifo_release(uint32_t canport, uint8_t fifo);
 bool can_available_mailbox(uint32_t canport);
diff --git a/include/libopencm3/stm32/common/dac_common_all.h b/include/libopencm3/stm32/common/dac_common_all.h
index 27628141..adeb0bc8 100644
--- a/include/libopencm3/stm32/common/dac_common_all.h
+++ b/include/libopencm3/stm32/common/dac_common_all.h
@@ -95,7 +95,8 @@ specific memorymap.h header before including this header file.*/
  * Unmask bits [(n-1)..0] of LFSR/Triangle Amplitude equal to (2**n)-1
  */
 #define DAC_CR_MAMP2_SHIFT		24
-/** @defgroup dac_mamp2 DAC Channel 2 LFSR Mask and Triangle Wave Amplitude values
+/** @defgroup dac_mamp2 DAC Channel 2 LFSR Mask and Triangle Wave Amplitude
+values
 @ingroup dac_defines
 
 Unmask bits [(n-1)..0] of LFSR/Triangle Amplitude equal to (2**(n)-1
@@ -207,7 +208,8 @@ Unmask bits [(n-1)..0] of LFSR/Triangle Amplitude equal to (2**(n)-1
  * Unmask bits [(n-1)..0] of LFSR/Triangle Amplitude equal to (2**n)-1
  */
 #define DAC_CR_MAMP1_SHIFT		8
-/** @defgroup dac_mamp1 DAC Channel 1 LFSR Mask and Triangle Wave Amplitude values
+/** @defgroup dac_mamp1 DAC Channel 1 LFSR Mask and Triangle Wave Amplitude
+values
 @ingroup dac_defines
 
 Unmask bits [(n-1)..0] of LFSR/Triangle Amplitude equal to (2**(n+1)-1
@@ -404,8 +406,10 @@ void dac_set_trigger_source(uint32_t dac_trig_src);
 void dac_set_waveform_generation(uint32_t dac_wave_ens);
 void dac_disable_waveform_generation(data_channel dac_channel);
 void dac_set_waveform_characteristics(uint32_t dac_mamp);
-void dac_load_data_buffer_single(uint16_t dac_data, data_align dac_data_format, data_channel dac_channel);
-void dac_load_data_buffer_dual(uint16_t dac_data1, uint16_t dac_data2, data_align dac_data_format);
+void dac_load_data_buffer_single(uint16_t dac_data, data_align dac_data_format,
+				 data_channel dac_channel);
+void dac_load_data_buffer_dual(uint16_t dac_data1, uint16_t dac_data2,
+			       data_align dac_data_format);
 void dac_software_trigger(data_channel dac_channel);
 
 END_DECLS
diff --git a/include/libopencm3/stm32/common/dma_common_f13.h b/include/libopencm3/stm32/common/dma_common_f13.h
index 70fedd11..ce329fbb 100644
--- a/include/libopencm3/stm32/common/dma_common_f13.h
+++ b/include/libopencm3/stm32/common/dma_common_f13.h
@@ -386,12 +386,14 @@ group.
 BEGIN_DECLS
 
 void dma_channel_reset(uint32_t dma, uint8_t channel);
-void dma_clear_interrupt_flags(uint32_t dma, uint8_t channel, uint32_t interrupts);
+void dma_clear_interrupt_flags(uint32_t dma, uint8_t channel,
+			       uint32_t interrupts);
 bool dma_get_interrupt_flag(uint32_t dma, uint8_t channel, uint32_t interrupts);
 void dma_enable_mem2mem_mode(uint32_t dma, uint8_t channel);
 void dma_set_priority(uint32_t dma, uint8_t channel, uint32_t prio);
 void dma_set_memory_size(uint32_t dma, uint8_t channel, uint32_t mem_size);
-void dma_set_peripheral_size(uint32_t dma, uint8_t channel, uint32_t peripheral_size);
+void dma_set_peripheral_size(uint32_t dma, uint8_t channel,
+			     uint32_t peripheral_size);
 void dma_enable_memory_increment_mode(uint32_t dma, uint8_t channel);
 void dma_disable_memory_increment_mode(uint32_t dma, uint8_t channel);
 void dma_enable_peripheral_increment_mode(uint32_t dma, uint8_t channel);
@@ -407,7 +409,8 @@ void dma_enable_transfer_complete_interrupt(uint32_t dma, uint8_t channel);
 void dma_disable_transfer_complete_interrupt(uint32_t dma, uint8_t channel);
 void dma_enable_channel(uint32_t dma, uint8_t channel);
 void dma_disable_channel(uint32_t dma, uint8_t channel);
-void dma_set_peripheral_address(uint32_t dma, uint8_t channel, uint32_t address);
+void dma_set_peripheral_address(uint32_t dma, uint8_t channel,
+				uint32_t address);
 void dma_set_memory_address(uint32_t dma, uint8_t channel, uint32_t address);
 void dma_set_number_of_data(uint32_t dma, uint8_t channel, uint16_t number);
 
diff --git a/include/libopencm3/stm32/common/dma_common_f24.h b/include/libopencm3/stm32/common/dma_common_f24.h
index 739f6890..a91f4a6b 100644
--- a/include/libopencm3/stm32/common/dma_common_f24.h
+++ b/include/libopencm3/stm32/common/dma_common_f24.h
@@ -573,12 +573,14 @@ BEGIN_DECLS
  */
 
 void dma_stream_reset(uint32_t dma, uint8_t stream);
-void dma_clear_interrupt_flags(uint32_t dma, uint8_t stream, uint32_t interrupts);
+void dma_clear_interrupt_flags(uint32_t dma, uint8_t stream,
+			       uint32_t interrupts);
 bool dma_get_interrupt_flag(uint32_t dma, uint8_t stream, uint32_t interrupt);
 void dma_set_transfer_mode(uint32_t dma, uint8_t stream, uint32_t direction);
 void dma_set_priority(uint32_t dma, uint8_t stream, uint32_t prio);
 void dma_set_memory_size(uint32_t dma, uint8_t stream, uint32_t mem_size);
-void dma_set_peripheral_size(uint32_t dma, uint8_t stream, uint32_t peripheral_size);
+void dma_set_peripheral_size(uint32_t dma, uint8_t stream,
+			     uint32_t peripheral_size);
 void dma_enable_memory_increment_mode(uint32_t dma, uint8_t stream);
 void dma_disable_memory_increment_mode(uint32_t dma, uint8_t channel);
 void dma_enable_peripheral_increment_mode(uint32_t dma, uint8_t stream);
diff --git a/include/libopencm3/stm32/common/gpio_common_f24.h b/include/libopencm3/stm32/common/gpio_common_f24.h
index 31ae6e89..820078f9 100644
--- a/include/libopencm3/stm32/common/gpio_common_f24.h
+++ b/include/libopencm3/stm32/common/gpio_common_f24.h
@@ -287,8 +287,10 @@ BEGIN_DECLS
  * sounding functions that have very different functionality.
  */
 
-void gpio_mode_setup(uint32_t gpioport, uint8_t mode, uint8_t pull_up_down, uint16_t gpios);
-void gpio_set_output_options(uint32_t gpioport, uint8_t otype, uint8_t speed, uint16_t gpios);
+void gpio_mode_setup(uint32_t gpioport, uint8_t mode, uint8_t pull_up_down,
+		     uint16_t gpios);
+void gpio_set_output_options(uint32_t gpioport, uint8_t otype, uint8_t speed,
+			     uint16_t gpios);
 void gpio_set_af(uint32_t gpioport, uint8_t alt_func_num, uint16_t gpios);
 
 END_DECLS
diff --git a/include/libopencm3/stm32/common/spi_common_all.h b/include/libopencm3/stm32/common/spi_common_all.h
index af77f4e7..5033e818 100644
--- a/include/libopencm3/stm32/common/spi_common_all.h
+++ b/include/libopencm3/stm32/common/spi_common_all.h
@@ -356,7 +356,8 @@ specific memorymap.h header before including this header file.*/
 BEGIN_DECLS
 
 void spi_reset(uint32_t spi_peripheral);
-int spi_init_master(uint32_t spi, uint32_t br, uint32_t cpol, uint32_t cpha, uint32_t dff, uint32_t lsbfirst);
+int spi_init_master(uint32_t spi, uint32_t br, uint32_t cpol, uint32_t cpha,
+		    uint32_t dff, uint32_t lsbfirst);
 void spi_enable(uint32_t spi);
 void spi_disable(uint32_t spi);
 uint16_t spi_clean_disable(uint32_t spi);
diff --git a/include/libopencm3/stm32/common/timer_common_all.h b/include/libopencm3/stm32/common/timer_common_all.h
index e9d8991c..d4c43c63 100644
--- a/include/libopencm3/stm32/common/timer_common_all.h
+++ b/include/libopencm3/stm32/common/timer_common_all.h
@@ -1070,16 +1070,20 @@ void timer_disable_oc_clear(uint32_t timer_peripheral, enum tim_oc_id oc_id);
 void timer_set_oc_fast_mode(uint32_t timer_peripheral, enum tim_oc_id oc_id);
 void timer_set_oc_slow_mode(uint32_t timer_peripheral, enum tim_oc_id oc_id);
 void timer_set_oc_mode(uint32_t timer_peripheral, enum tim_oc_id oc_id,
-			enum tim_oc_mode oc_mode);
+		       enum tim_oc_mode oc_mode);
 void timer_enable_oc_preload(uint32_t timer_peripheral, enum tim_oc_id oc_id);
 void timer_disable_oc_preload(uint32_t timer_peripheral, enum tim_oc_id oc_id);
-void timer_set_oc_polarity_high(uint32_t timer_peripheral, enum tim_oc_id oc_id);
+void timer_set_oc_polarity_high(uint32_t timer_peripheral,
+				enum tim_oc_id oc_id);
 void timer_set_oc_polarity_low(uint32_t timer_peripheral, enum tim_oc_id oc_id);
 void timer_enable_oc_output(uint32_t timer_peripheral, enum tim_oc_id oc_id);
 void timer_disable_oc_output(uint32_t timer_peripheral, enum tim_oc_id oc_id);
-void timer_set_oc_idle_state_set(uint32_t timer_peripheral, enum tim_oc_id oc_id);
-void timer_set_oc_idle_state_unset(uint32_t timer_peripheral, enum tim_oc_id oc_id);
-void timer_set_oc_value(uint32_t timer_peripheral, enum tim_oc_id oc_id, uint32_t value);
+void timer_set_oc_idle_state_set(uint32_t timer_peripheral,
+				 enum tim_oc_id oc_id);
+void timer_set_oc_idle_state_unset(uint32_t timer_peripheral,
+				   enum tim_oc_id oc_id);
+void timer_set_oc_value(uint32_t timer_peripheral, enum tim_oc_id oc_id,
+			uint32_t value);
 void timer_enable_break_main_output(uint32_t timer_peripheral);
 void timer_disable_break_main_output(uint32_t timer_peripheral);
 void timer_enable_break_automatic_output(uint32_t timer_peripheral);
@@ -1098,9 +1102,12 @@ void timer_generate_event(uint32_t timer_peripheral, uint32_t event);
 uint32_t timer_get_counter(uint32_t timer_peripheral);
 void timer_set_counter(uint32_t timer_peripheral, uint32_t count);
 
-void timer_ic_set_filter(uint32_t timer, enum tim_ic_id ic, enum tim_ic_filter flt);
-void timer_ic_set_prescaler(uint32_t timer, enum tim_ic_id ic, enum tim_ic_psc psc);
-void timer_ic_set_input(uint32_t timer, enum tim_ic_id ic, enum tim_ic_input in);
+void timer_ic_set_filter(uint32_t timer, enum tim_ic_id ic,
+			 enum tim_ic_filter flt);
+void timer_ic_set_prescaler(uint32_t timer, enum tim_ic_id ic,
+			    enum tim_ic_psc psc);
+void timer_ic_set_input(uint32_t timer, enum tim_ic_id ic,
+			enum tim_ic_input in);
 void timer_ic_enable(uint32_t timer, enum tim_ic_id ic);
 void timer_ic_disable(uint32_t timer, enum tim_ic_id ic);
 
diff --git a/include/libopencm3/stm32/common/timer_common_f24.h b/include/libopencm3/stm32/common/timer_common_f24.h
index bdde4f89..67ba593c 100644
--- a/include/libopencm3/stm32/common/timer_common_f24.h
+++ b/include/libopencm3/stm32/common/timer_common_f24.h
@@ -49,7 +49,8 @@ specific memorymap.h header before including this header file.*/
 
 /* ITR1_RMP */
 /****************************************************************************/
-/** @defgroup tim2_opt_trigger_remap TIM2_OR Timer 2 Option Register Internal Trigger 1 Remap
+/** @defgroup tim2_opt_trigger_remap TIM2_OR Timer 2 Option Register Internal
+Trigger 1 Remap
 
 Only available in F2 and F4 series.
 @ingroup timer_defines
@@ -99,7 +100,8 @@ enum tim_ic_pol {
 BEGIN_DECLS
 
 void timer_set_option(uint32_t timer_peripheral, uint32_t option);
-void timer_ic_set_polarity(uint32_t timer, enum tim_ic_id ic, enum tim_ic_pol pol);
+void timer_ic_set_polarity(uint32_t timer, enum tim_ic_id ic,
+			   enum tim_ic_pol pol);
 
 END_DECLS
 
diff --git a/include/libopencm3/stm32/f1/adc.h b/include/libopencm3/stm32/f1/adc.h
index 5532ca63..f66eabaa 100644
--- a/include/libopencm3/stm32/f1/adc.h
+++ b/include/libopencm3/stm32/f1/adc.h
@@ -605,7 +605,8 @@ and ADC2
 
 /* JL[2:0]: Discontinous mode channel count injected channels. */
 /****************************************************************************/
-/** @defgroup adc_jsqr_jl ADC Number of channels in discontinuous mode fro injected channels.
+/** @defgroup adc_jsqr_jl ADC Number of channels in discontinuous mode fro
+injected channels.
 @ingroup adc_defines
 
 @{*/
@@ -655,7 +656,8 @@ void adc_disable_discontinuous_mode_injected(uint32_t adc);
 void adc_enable_automatic_injected_group_conversion(uint32_t adc);
 void adc_disable_automatic_injected_group_conversion(uint32_t adc);
 void adc_enable_analog_watchdog_on_all_channels(uint32_t adc);
-void adc_enable_analog_watchdog_on_selected_channel(uint32_t adc, uint8_t channel);
+void adc_enable_analog_watchdog_on_selected_channel(uint32_t adc,
+						    uint8_t channel);
 void adc_enable_scan_mode(uint32_t adc);
 void adc_disable_scan_mode(uint32_t adc);
 void adc_enable_eoc_interrupt_injected(uint32_t adc);
diff --git a/include/libopencm3/stm32/f1/gpio.h b/include/libopencm3/stm32/f1/gpio.h
index 51634206..4bb4c0b2 100644
--- a/include/libopencm3/stm32/f1/gpio.h
+++ b/include/libopencm3/stm32/f1/gpio.h
@@ -948,7 +948,8 @@ Line Devices only
 
 BEGIN_DECLS
 
-void gpio_set_mode(uint32_t gpioport, uint8_t mode, uint8_t cnf, uint16_t gpios);
+void gpio_set_mode(uint32_t gpioport, uint8_t mode, uint8_t cnf,
+		   uint16_t gpios);
 void gpio_set_eventout(uint8_t evoutport, uint8_t evoutpin);
 void gpio_primary_remap(uint32_t swjenable, uint32_t maps);
 void gpio_secondary_remap(uint32_t maps);
diff --git a/include/libopencm3/stm32/f1/timer.h b/include/libopencm3/stm32/f1/timer.h
index 43fd1f37..6046d792 100644
--- a/include/libopencm3/stm32/f1/timer.h
+++ b/include/libopencm3/stm32/f1/timer.h
@@ -47,7 +47,9 @@ enum tim_ic_pol {
 
 BEGIN_DECLS
 
-void timer_ic_set_polarity(uint32_t timer, enum tim_ic_id ic, enum tim_ic_pol pol);
+void timer_ic_set_polarity(uint32_t timer,
+			   enum tim_ic_id ic,
+			   enum tim_ic_pol pol);
 
 END_DECLS
 
diff --git a/include/libopencm3/stm32/f1/usb_desc.h b/include/libopencm3/stm32/f1/usb_desc.h
index e3d0e6f1..fa87264b 100644
--- a/include/libopencm3/stm32/f1/usb_desc.h
+++ b/include/libopencm3/stm32/f1/usb_desc.h
@@ -34,55 +34,55 @@ struct usb_desc_head {
 
 struct usb_device_desc {
 	struct usb_desc_head h;	/* Size 0x12, ID 0x01 */
-	uint16_t bcd_usb;		/* USB Version */
+	uint16_t bcd_usb;	/* USB Version */
 	uint8_t class;		/* Device class */
-	uint8_t sub_class;		/* Subclass code */
-	uint8_t protocol;		/* Protocol code */
-	uint8_t max_psize;		/* Maximum packet size -> 64bytes */
-	uint16_t vendor;		/* Vendor number */
-	uint16_t product;		/* Device number */
-	uint16_t bcd_dev;		/* Device version */
-	uint8_t man_desc;		/* Index of manufacturer string desc */
-	uint8_t prod_desc;		/* Index of product string desc */
-	uint8_t sn_desc;		/* Index of serial number string desc */
-	uint8_t num_conf;		/* Number of possible configurations */
+	uint8_t sub_class;	/* Subclass code */
+	uint8_t protocol;	/* Protocol code */
+	uint8_t max_psize;	/* Maximum packet size -> 64bytes */
+	uint16_t vendor;	/* Vendor number */
+	uint16_t product;	/* Device number */
+	uint16_t bcd_dev;	/* Device version */
+	uint8_t man_desc;	/* Index of manufacturer string desc */
+	uint8_t prod_desc;	/* Index of product string desc */
+	uint8_t sn_desc;	/* Index of serial number string desc */
+	uint8_t num_conf;	/* Number of possible configurations */
 };
 
 struct usb_conf_desc_header {
 	struct usb_desc_head h;	/* Size 0x09, Id 0x02 */
-	uint16_t tot_leng;		/* Total length of data */
-	uint8_t num_int;		/* Number of interfaces */
-	uint8_t conf_val;		/* Configuration selector */
-	uint8_t conf_desc;		/* Index of conf string desc */
+	uint16_t tot_leng;	/* Total length of data */
+	uint8_t num_int;	/* Number of interfaces */
+	uint8_t conf_val;	/* Configuration selector */
+	uint8_t conf_desc;	/* Index of conf string desc */
 	uint8_t attr;		/* Attribute bitmap:
 				 * 7    : Bus powered
 				 * 6    : Self powered
 				 * 5    : Remote wakeup
 				 * 4..0 : Reserved -> 0000
 				 */
-	uint8_t max_power;		/* Maximum power consumption in 2mA steps */
+	uint8_t max_power;	/* Maximum power consumption in 2mA steps */
 };
 
 struct usb_int_desc_header {
 	struct usb_desc_head h;	/* Size 0x09, Id 0x04 */
-	uint8_t iface_num;		/* Interface id number */
-	uint8_t alt_setting;		/* Alternative setting selector */
-	uint8_t num_endp;		/* Endpoints used */
+	uint8_t iface_num;	/* Interface id number */
+	uint8_t alt_setting;	/* Alternative setting selector */
+	uint8_t num_endp;	/* Endpoints used */
 	uint8_t class;		/* Interface class */
-	uint8_t sub_class;		/* Subclass code */
-	uint8_t protocol;		/* Protocol code */
-	uint8_t iface_desc;		/* Index of interface string desc */
+	uint8_t sub_class;	/* Subclass code */
+	uint8_t protocol;	/* Protocol code */
+	uint8_t iface_desc;	/* Index of interface string desc */
 };
 
 struct usb_ep_desc {
 	struct usb_desc_head h;	/* Size 0x07, Id 0x05 */
-	uint8_t ep_addr;		/* Endpoint address:
+	uint8_t ep_addr;	/* Endpoint address:
 				   0..3 : Endpoint Number
 				   4..6 : Reserved        -> 0
 				   7    : Direction 0=out 1=in */
-	uint8_t ep_attr;		/* Endpoint attributes */
-	uint16_t max_psize;		/* Maximum packet size -> 64bytes */
-	uint8_t interval;		/* Interval for polling endpoint
+	uint8_t ep_attr;	/* Endpoint attributes */
+	uint16_t max_psize;	/* Maximum packet size -> 64bytes */
+	uint8_t interval;	/* Interval for polling endpoint
 				   data. Ignored for bulk & control
 				   endpoints. */
 };
@@ -95,7 +95,7 @@ struct usb_conf_desc {
 
 struct usb_string_desc {
 	struct usb_desc_head h;	/* Size > 0x02, Id 0x03 */
-	uint16_t string[];		/* String UTF16 encoded */
+	uint16_t string[];	/* String UTF16 encoded */
 };
 
 #endif
diff --git a/include/libopencm3/stm32/f2/rcc.h b/include/libopencm3/stm32/f2/rcc.h
index 6b1268f3..85b1eee2 100644
--- a/include/libopencm3/stm32/f2/rcc.h
+++ b/include/libopencm3/stm32/f2/rcc.h
@@ -505,8 +505,10 @@ void rcc_set_ppre2(uint32_t ppre2);
 void rcc_set_ppre1(uint32_t ppre1);
 void rcc_set_hpre(uint32_t hpre);
 void rcc_set_rtcpre(uint32_t rtcpre);
-void rcc_set_main_pll_hsi(uint32_t pllm, uint32_t plln, uint32_t pllp, uint32_t pllq);
-void rcc_set_main_pll_hse(uint32_t pllm, uint32_t plln, uint32_t pllp, uint32_t pllq);
+void rcc_set_main_pll_hsi(uint32_t pllm, uint32_t plln, uint32_t pllp,
+			  uint32_t pllq);
+void rcc_set_main_pll_hse(uint32_t pllm, uint32_t plln, uint32_t pllp,
+			  uint32_t pllq);
 uint32_t rcc_system_clock_source(void);
 void rcc_clock_setup_hse_3v3(const clock_scale_t *clock);
 void rcc_backupdomain_reset(void);
diff --git a/include/libopencm3/stm32/f4/adc.h b/include/libopencm3/stm32/f4/adc.h
index 51bc44e1..ed6d4e8d 100644
--- a/include/libopencm3/stm32/f4/adc.h
+++ b/include/libopencm3/stm32/f4/adc.h
@@ -804,7 +804,8 @@ void adc_disable_discontinuous_mode_injected(uint32_t adc);
 void adc_enable_automatic_injected_group_conversion(uint32_t adc);
 void adc_disable_automatic_injected_group_conversion(uint32_t adc);
 void adc_enable_analog_watchdog_on_all_channels(uint32_t adc);
-void adc_enable_analog_watchdog_on_selected_channel(uint32_t adc, uint8_t channel);
+void adc_enable_analog_watchdog_on_selected_channel(uint32_t adc,
+						    uint8_t channel);
 void adc_enable_scan_mode(uint32_t adc);
 void adc_disable_scan_mode(uint32_t adc);
 void adc_enable_eoc_interrupt_injected(uint32_t adc);
@@ -837,8 +838,10 @@ void adc_set_injected_offset(uint32_t adc, uint8_t reg, uint32_t offset);
 
 void adc_set_clk_prescale(uint32_t prescaler);
 void adc_set_multi_mode(uint32_t mode);
-void adc_enable_external_trigger_regular(uint32_t adc, uint32_t trigger, uint32_t polarity);
-void adc_enable_external_trigger_injected(uint32_t adc, uint32_t trigger, uint32_t polarity);
+void adc_enable_external_trigger_regular(uint32_t adc, uint32_t trigger,
+					 uint32_t polarity);
+void adc_enable_external_trigger_injected(uint32_t adc, uint32_t trigger,
+					  uint32_t polarity);
 void adc_set_resolution(uint32_t adc, uint16_t resolution);
 void adc_enable_overrun_interrupt(uint32_t adc);
 void adc_disable_overrun_interrupt(uint32_t adc);
diff --git a/include/libopencm3/stm32/f4/rcc.h b/include/libopencm3/stm32/f4/rcc.h
index d86c24de..e6948e18 100644
--- a/include/libopencm3/stm32/f4/rcc.h
+++ b/include/libopencm3/stm32/f4/rcc.h
@@ -511,8 +511,10 @@ void rcc_set_ppre2(uint32_t ppre2);
 void rcc_set_ppre1(uint32_t ppre1);
 void rcc_set_hpre(uint32_t hpre);
 void rcc_set_rtcpre(uint32_t rtcpre);
-void rcc_set_main_pll_hsi(uint32_t pllm, uint32_t plln, uint32_t pllp, uint32_t pllq);
-void rcc_set_main_pll_hse(uint32_t pllm, uint32_t plln, uint32_t pllp, uint32_t pllq);
+void rcc_set_main_pll_hsi(uint32_t pllm, uint32_t plln, uint32_t pllp,
+			  uint32_t pllq);
+void rcc_set_main_pll_hse(uint32_t pllm, uint32_t plln, uint32_t pllp,
+			  uint32_t pllq);
 uint32_t rcc_system_clock_source(void);
 void rcc_clock_setup_hse_3v3(const clock_scale_t *clock);
 void rcc_backupdomain_reset(void);
diff --git a/include/libopencm3/stm32/l1/gpio.h b/include/libopencm3/stm32/l1/gpio.h
index 979f7510..8f0b90e4 100644
--- a/include/libopencm3/stm32/l1/gpio.h
+++ b/include/libopencm3/stm32/l1/gpio.h
@@ -251,8 +251,10 @@ BEGIN_DECLS
  * TODO: this should all really be moved to a "common" gpio header
  */
 
-void gpio_mode_setup(uint32_t gpioport, uint8_t mode, uint8_t pull_up_down, uint16_t gpios);
-void gpio_set_output_options(uint32_t gpioport, uint8_t otype, uint8_t speed, uint16_t gpios);
+void gpio_mode_setup(uint32_t gpioport, uint8_t mode, uint8_t pull_up_down,
+		     uint16_t gpios);
+void gpio_set_output_options(uint32_t gpioport, uint8_t otype, uint8_t speed,
+			     uint16_t gpios);
 void gpio_set_af(uint32_t gpioport, uint8_t alt_func_num, uint16_t gpios);
 
 END_DECLS
diff --git a/include/libopencm3/stm32/l1/rcc.h b/include/libopencm3/stm32/l1/rcc.h
index 81ea277c..b31bc687 100644
--- a/include/libopencm3/stm32/l1/rcc.h
+++ b/include/libopencm3/stm32/l1/rcc.h
@@ -442,7 +442,8 @@ void rcc_peripheral_disable_clock(volatile uint32_t *reg, uint32_t en);
 void rcc_peripheral_reset(volatile uint32_t *reg, uint32_t reset);
 void rcc_peripheral_clear_reset(volatile uint32_t *reg, uint32_t clear_reset);
 void rcc_set_sysclk_source(uint32_t clk);
-void rcc_set_pll_configuration(uint32_t source, uint32_t multiplier, uint32_t divisor);
+void rcc_set_pll_configuration(uint32_t source, uint32_t multiplier,
+			       uint32_t divisor);
 void rcc_set_pll_source(uint32_t pllsrc);
 void rcc_set_adcpre(uint32_t adcpre);
 void rcc_set_ppre2(uint32_t ppre2);
diff --git a/include/libopencm3/stm32/otg_fs.h b/include/libopencm3/stm32/otg_fs.h
index 45e395ba..d8fd262b 100644
--- a/include/libopencm3/stm32/otg_fs.h
+++ b/include/libopencm3/stm32/otg_fs.h
@@ -39,8 +39,8 @@
 #define OTG_FS_GCCFG			MMIO32(USB_OTG_FS_BASE + 0x038)
 #define OTG_FS_CID			MMIO32(USB_OTG_FS_BASE + 0x03C)
 #define OTG_FS_HPTXFSIZ			MMIO32(USB_OTG_FS_BASE + 0x100)
-#define OTG_FS_DIEPTXF(x)		MMIO32(USB_OTG_FS_BASE + 0x104 + \
-						4*(x-1))
+#define OTG_FS_DIEPTXF(x)		MMIO32(USB_OTG_FS_BASE + 0x104 \
+					       + 4*(x-1))
 
 /* Host-mode Control and Status Registers */
 #define OTG_FS_HCFG			MMIO32(USB_OTG_FS_BASE + 0x400)
@@ -89,8 +89,9 @@
 #define OTG_FS_PCGCCTL			MMIO32(USB_OTG_FS_BASE + 0xE00)
 
 /* Data FIFO */
-#define OTG_FS_FIFO(x)			((volatile uint32_t*)(USB_OTG_FS_BASE + \
-						(((x) + 1) << 12)))
+#define OTG_FS_FIFO(x) 			((volatile uint32_t*)(USB_OTG_FS_BASE \
+							      + (((x) + 1) \
+								 << 12)))
 
 /* Global CSRs */
 /* OTG_FS USB control registers (OTG_HS_GOTGCTL) */
diff --git a/include/libopencm3/stm32/otg_hs.h b/include/libopencm3/stm32/otg_hs.h
index b47982a8..71f1476f 100644
--- a/include/libopencm3/stm32/otg_hs.h
+++ b/include/libopencm3/stm32/otg_hs.h
@@ -145,8 +145,8 @@
 #define OTG_HS_PCGCCTL			MMIO32(USB_OTG_HS_BASE + OTG_PCGCCTL)
 
 /* Data FIFO */
-#define OTG_HS_FIFO(x)			((volatile uint32_t*)(USB_OTG_HS_BASE + \
-						OTG_FIFO(x)))
+#define OTG_HS_FIFO(x)			((volatile uint32_t*)(USB_OTG_HS_BASE \
+							      + OTG_FIFO(x)))
 
 /* Global CSRs */
 /* OTG_HS USB control registers (OTG_FS_GOTGCTL) */
diff --git a/include/libopencm3/usb/usbd.h b/include/libopencm3/usb/usbd.h
index 07cccc38..b4f6bcdb 100644
--- a/include/libopencm3/usb/usbd.h
+++ b/include/libopencm3/usb/usbd.h
@@ -63,7 +63,8 @@ extern usbd_device * usbd_init(const usbd_driver *driver,
 			       const struct usb_device_descriptor *dev,
 			       const struct usb_config_descriptor *conf,
 			       const char **strings, int num_strings,
-			       uint8_t *control_buffer, uint16_t control_buffer_size);
+			       uint8_t *control_buffer,
+			       uint16_t control_buffer_size);
 
 extern void usbd_register_reset_callback(usbd_device *usbd_dev,
 					 void (*callback)(void));
@@ -86,14 +87,15 @@ extern int usbd_register_control_callback(usbd_device *usbd_dev, uint8_t type,
 
 /* <usb_standard.c> */
 extern void usbd_register_set_config_callback(usbd_device *usbd_dev,
-		void (*callback)(usbd_device *usbd_dev, uint16_t wValue));
+	void (*callback)(usbd_device *usbd_dev, uint16_t wValue));
 
 /* Functions to be provided by the hardware abstraction layer */
 extern void usbd_poll(usbd_device *usbd_dev);
 extern void usbd_disconnect(usbd_device *usbd_dev, bool disconnected);
 
-extern void usbd_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type, uint16_t max_size,
-	      void (*callback)(usbd_device *usbd_dev, uint8_t ep));
+extern void usbd_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type,
+		uint16_t max_size,
+		void (*callback)(usbd_device *usbd_dev, uint8_t ep));
 
 extern uint16_t usbd_ep_write_packet(usbd_device *usbd_dev, uint8_t addr,
 				const void *buf, uint16_t len);
@@ -101,7 +103,8 @@ extern uint16_t usbd_ep_write_packet(usbd_device *usbd_dev, uint8_t addr,
 extern uint16_t usbd_ep_read_packet(usbd_device *usbd_dev, uint8_t addr,
 			       void *buf, uint16_t len);
 
-extern void usbd_ep_stall_set(usbd_device *usbd_dev, uint8_t addr, uint8_t stall);
+extern void usbd_ep_stall_set(usbd_device *usbd_dev, uint8_t addr,
+			      uint8_t stall);
 extern uint8_t usbd_ep_stall_get(usbd_device *usbd_dev, uint8_t addr);
 
 extern void usbd_ep_nak_set(usbd_device *usbd_dev, uint8_t addr, uint8_t nak);
diff --git a/lib/lm4f/gpio.c b/lib/lm4f/gpio.c
index b1d847e3..22399bd8 100644
--- a/lib/lm4f/gpio.c
+++ b/lib/lm4f/gpio.c
@@ -206,8 +206,8 @@ void gpio_enable_ahb_aperture(void)
  * @param[in] gpios @ref gpio_pin_id. Any combination of pins may be specified
  *		    by OR'ing then together
  */
-void gpio_mode_setup(uint32_t gpioport, enum gpio_mode mode, enum gpio_pullup pullup,
-		     uint8_t gpios)
+void gpio_mode_setup(uint32_t gpioport, enum gpio_mode mode,
+		     enum gpio_pullup pullup, uint8_t gpios)
 {
 	switch (mode) {
 	case GPIO_MODE_OUTPUT:
@@ -524,7 +524,8 @@ void gpio_toggle(uint32_t gpioport, uint8_t gpios)
  * @param[in] gpios @ref gpio_pin_id. Any combination of pins may be specified
  *		    by OR'ing then together
  */
-void gpio_configure_trigger(uint32_t gpioport, enum gpio_trigger trigger, uint8_t gpios)
+void gpio_configure_trigger(uint32_t gpioport, enum gpio_trigger trigger,
+			    uint8_t gpios)
 {
 	switch (trigger) {
 	case GPIO_TRIG_LVL_LOW:
diff --git a/lib/lm4f/usb_lm4f.c b/lib/lm4f/usb_lm4f.c
index aab21b7f..2dc3d830 100644
--- a/lib/lm4f/usb_lm4f.c
+++ b/lib/lm4f/usb_lm4f.c
@@ -22,7 +22,8 @@
  *
  * @ingroup LM4Fxx
  *
- * @author @htmlonly &copy; @endhtmlonly 2013 Alexandru Gagniuc <mr.nuke.me@gmail.com>
+ * @author @htmlonly &copy; @endhtmlonly 2013
+ * Alexandru Gagniuc <mr.nuke.me@gmail.com>
  *
  * \brief <b>libopencm3 LM4F Universal Serial Bus controller </b>
  *
@@ -183,8 +184,9 @@ static void lm4f_set_address(usbd_device *usbd_dev, uint8_t addr)
 	USB_FADDR = addr & USB_FADDR_FUNCADDR_MASK;
 }
 
-static void lm4f_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type, uint16_t max_size,
-			void (*callback) (usbd_device *usbd_dev, uint8_t ep))
+static void lm4f_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type,
+			  uint16_t max_size,
+			  void (*callback) (usbd_device *usbd_dev, uint8_t ep))
 {
 	(void)usbd_dev;
 	(void)type;
@@ -296,7 +298,8 @@ static void lm4f_endpoints_reset(usbd_device *usbd_dev)
 	usbd_dev->fifo_mem_top = 64;
 }
 
-static void lm4f_ep_stall_set(usbd_device *usbd_dev, uint8_t addr, uint8_t stall)
+static void lm4f_ep_stall_set(usbd_device *usbd_dev, uint8_t addr,
+			      uint8_t stall)
 {
 	(void)usbd_dev;
 
@@ -405,8 +408,8 @@ static uint16_t lm4f_ep_write_packet(usbd_device *usbd_dev, uint8_t addr,
 	return i;
 }
 
-static uint16_t lm4f_ep_read_packet(usbd_device *usbd_dev, uint8_t addr, void *buf,
-			       uint16_t len)
+static uint16_t lm4f_ep_read_packet(usbd_device *usbd_dev, uint8_t addr,
+				    void *buf, uint16_t len)
 {
 	(void)usbd_dev;
 
diff --git a/lib/stm32/can.c b/lib/stm32/can.c
index 4b004e26..d693a978 100644
--- a/lib/stm32/can.c
+++ b/lib/stm32/can.c
@@ -99,8 +99,8 @@ Initialize the selected CAN peripheral block.
 @returns int 0 on success, 1 on initialization failure.
 */
 int can_init(uint32_t canport, bool ttcm, bool abom, bool awum, bool nart,
-	     bool rflm, bool txfp, uint32_t sjw, uint32_t ts1, uint32_t ts2, uint32_t brp,
-	     bool loopback, bool silent)
+	     bool rflm, bool txfp, uint32_t sjw, uint32_t ts1, uint32_t ts2,
+	     uint32_t brp, bool loopback, bool silent)
 {
 	volatile uint32_t wait_ack;
 	int ret = 0;
@@ -206,8 +206,9 @@ Initialize incoming message filter and assign to FIFO.
 @param[in] fifo Unsigned int32. FIFO id.
 @param[in] enable bool. Enable filter?
  */
-void can_filter_init(uint32_t canport, uint32_t nr, bool scale_32bit, bool id_list_mode,
-		     uint32_t fr1, uint32_t fr2, uint32_t fifo, bool enable)
+void can_filter_init(uint32_t canport, uint32_t nr, bool scale_32bit,
+		     bool id_list_mode, uint32_t fr1, uint32_t fr2,
+		     uint32_t fifo, bool enable)
 {
 	uint32_t filter_select_bit = 0x00000001 << nr;
 
@@ -266,8 +267,9 @@ void can_filter_init(uint32_t canport, uint32_t nr, bool scale_32bit, bool id_li
 @param[in] fifo Unsigned int32. FIFO id.
 @param[in] enable bool. Enable filter?
  */
-void can_filter_id_mask_16bit_init(uint32_t canport, uint32_t nr, uint16_t id1, uint16_t mask1,
-				   uint16_t id2, uint16_t mask2, uint32_t fifo, bool enable)
+void can_filter_id_mask_16bit_init(uint32_t canport, uint32_t nr, uint16_t id1,
+				   uint16_t mask1, uint16_t id2,
+				   uint16_t mask2, uint32_t fifo, bool enable)
 {
 	can_filter_init(canport, nr, false, false,
 			((uint32_t)id1 << 16) | (uint32_t)mask1,
@@ -284,8 +286,8 @@ void can_filter_id_mask_16bit_init(uint32_t canport, uint32_t nr, uint16_t id1,
 @param[in] fifo Unsigned int32. FIFO id.
 @param[in] enable bool. Enable filter?
  */
-void can_filter_id_mask_32bit_init(uint32_t canport, uint32_t nr, uint32_t id, uint32_t mask,
-				   uint32_t fifo, bool enable)
+void can_filter_id_mask_32bit_init(uint32_t canport, uint32_t nr, uint32_t id,
+				   uint32_t mask, uint32_t fifo, bool enable)
 {
 	can_filter_init(canport, nr, true, false, id, mask, fifo, enable);
 }
@@ -302,8 +304,10 @@ void can_filter_id_mask_32bit_init(uint32_t canport, uint32_t nr, uint32_t id, u
 @param[in] fifo Unsigned int32. FIFO id.
 @param[in] enable bool. Enable filter?
  */
-void can_filter_id_list_16bit_init(uint32_t canport, uint32_t nr, uint16_t id1, uint16_t id2,
-				   uint16_t id3, uint16_t id4, uint32_t fifo, bool enable)
+void can_filter_id_list_16bit_init(uint32_t canport, uint32_t nr,
+				   uint16_t id1, uint16_t id2,
+				   uint16_t id3, uint16_t id4,
+				   uint32_t fifo, bool enable)
 {
 	can_filter_init(canport, nr, false, true,
 			((uint32_t)id1 << 16) | (uint32_t)id2,
@@ -320,7 +324,8 @@ void can_filter_id_list_16bit_init(uint32_t canport, uint32_t nr, uint16_t id1,
 @param[in] fifo Unsigned int32. FIFO id.
 @param[in] enable bool. Enable filter?
  */
-void can_filter_id_list_32bit_init(uint32_t canport, uint32_t nr, uint32_t id1, uint32_t id2,
+void can_filter_id_list_32bit_init(uint32_t canport, uint32_t nr,
+				   uint32_t id1, uint32_t id2,
 				   uint32_t fifo, bool enable)
 {
 	can_filter_init(canport, nr, true, true, id1, id2, fifo, enable);
@@ -360,7 +365,8 @@ void can_disable_irq(uint32_t canport, uint32_t irq)
 @returns int 0, 1 or 2 on success and depending on which outgoing mailbox got
 selected. -1 if no mailbox was available and no transmission got queued.
  */
-int can_transmit(uint32_t canport, uint32_t id, bool ext, bool rtr, uint8_t length, uint8_t *data)
+int can_transmit(uint32_t canport, uint32_t id, bool ext, bool rtr,
+		 uint8_t length, uint8_t *data)
 {
 	int ret = 0;
 	uint32_t mailbox = 0;
@@ -473,8 +479,9 @@ void can_fifo_release(uint32_t canport, uint8_t fifo)
 @param[out] length Unsigned int8 pointer. Length of message payload.
 @param[out] data Unsigned int8[]. Message payload data.
  */
-void can_receive(uint32_t canport, uint8_t fifo, bool release, uint32_t *id, bool *ext,
-		 bool *rtr, uint32_t *fmi, uint8_t *length, uint8_t *data)
+void can_receive(uint32_t canport, uint8_t fifo, bool release, uint32_t *id,
+		 bool *ext, bool *rtr, uint32_t *fmi, uint8_t *length,
+		 uint8_t *data)
 {
 	uint32_t fifo_id = 0;
 	union {
diff --git a/lib/stm32/common/dac_common_all.c b/lib/stm32/common/dac_common_all.c
index 87ee190d..b4e8807b 100644
--- a/lib/stm32/common/dac_common_all.c
+++ b/lib/stm32/common/dac_common_all.c
@@ -339,8 +339,9 @@ existing output values in the DAC output registers.
 
 @note The DAC trigger must be enabled for this to work.
 
-@param[in] dac_wave_ens uint32_t. Taken from @ref dac_wave1_en or @ref dac_wave2_en
-or a logical OR of one of each of these to set both channels simultaneously.
+@param[in] dac_wave_ens uint32_t. Taken from @ref dac_wave1_en or @ref
+dac_wave2_en or a logical OR of one of each of these to set both channels
+simultaneously.
 */
 
 void dac_set_waveform_generation(uint32_t dac_wave_ens)
diff --git a/lib/stm32/common/dma_common_f13.c b/lib/stm32/common/dma_common_f13.c
index 1130eb48..d705964d 100644
--- a/lib/stm32/common/dma_common_f13.c
+++ b/lib/stm32/common/dma_common_f13.c
@@ -75,7 +75,8 @@ same channel may be cleared by using the logical OR of the interrupt flags.
 dma_if_offset
 */
 
-void dma_clear_interrupt_flags(uint32_t dma, uint8_t channel, uint32_t interrupts)
+void dma_clear_interrupt_flags(uint32_t dma, uint8_t channel,
+			       uint32_t interrupts)
 {
 /* Get offset to interrupt flag location in channel field */
 	uint32_t flags = (interrupts << DMA_FLAG_OFFSET(channel));
@@ -165,7 +166,8 @@ if the peripheral does not support byte or half-word writes.
 dma_ch_perwidth.
 */
 
-void dma_set_peripheral_size(uint32_t dma, uint8_t channel, uint32_t peripheral_size)
+void dma_set_peripheral_size(uint32_t dma, uint8_t channel,
+			     uint32_t peripheral_size)
 {
 	DMA_CCR(dma, channel) &= ~(DMA_CCR_PSIZE_MASK);
 	DMA_CCR(dma, channel) |= peripheral_size;
diff --git a/lib/stm32/common/dma_common_f24.c b/lib/stm32/common/dma_common_f24.c
index 00087ad7..6b655636 100644
--- a/lib/stm32/common/dma_common_f24.c
+++ b/lib/stm32/common/dma_common_f24.c
@@ -92,7 +92,8 @@ same stream may be cleared by using the bitwise OR of the interrupt flags.
 dma_if_offset
 */
 
-void dma_clear_interrupt_flags(uint32_t dma, uint8_t stream, uint32_t interrupts)
+void dma_clear_interrupt_flags(uint32_t dma, uint8_t stream,
+			       uint32_t interrupts)
 {
 	/* Get offset to interrupt flag location in stream field */
 	uint32_t flags = (interrupts << DMA_ISR_OFFSET(stream));
@@ -213,7 +214,8 @@ Ensure that the stream is disabled otherwise the setting will not be changed.
 dma_st_perwidth.
 */
 
-void dma_set_peripheral_size(uint32_t dma, uint8_t stream, uint32_t peripheral_size)
+void dma_set_peripheral_size(uint32_t dma, uint8_t stream,
+			     uint32_t peripheral_size)
 {
 	DMA_SCR(dma, stream) &= ~(DMA_SxCR_PSIZE_MASK);
 	DMA_SCR(dma, stream) |= peripheral_size;
diff --git a/lib/stm32/common/gpio_common_f24.c b/lib/stm32/common/gpio_common_f24.c
index ff667797..d99e11b5 100644
--- a/lib/stm32/common/gpio_common_f24.c
+++ b/lib/stm32/common/gpio_common_f24.c
@@ -86,7 +86,8 @@ gpio_pup
 	     If multiple pins are to be set, use bitwise OR '|' to separate
 	     them.
 */
-void gpio_mode_setup(uint32_t gpioport, uint8_t mode, uint8_t pull_up_down, uint16_t gpios)
+void gpio_mode_setup(uint32_t gpioport, uint8_t mode, uint8_t pull_up_down,
+		     uint16_t gpios)
 {
 	uint16_t i;
 	uint32_t moder, pupd;
@@ -128,7 +129,8 @@ port.
 	     If multiple pins are to be set, use bitwise OR '|' to separate
 	     them.
 */
-void gpio_set_output_options(uint32_t gpioport, uint8_t otype, uint8_t speed, uint16_t gpios)
+void gpio_set_output_options(uint32_t gpioport, uint8_t otype, uint8_t speed,
+			     uint16_t gpios)
 {
 	uint16_t i;
 	uint32_t ospeedr;
diff --git a/lib/stm32/common/iwdg_common_all.c b/lib/stm32/common/iwdg_common_all.c
index f24fb540..d9aca5a9 100644
--- a/lib/stm32/common/iwdg_common_all.c
+++ b/lib/stm32/common/iwdg_common_all.c
@@ -66,8 +66,8 @@ A delay of up to 5 clock cycles of the LSI clock (about 156 microseconds)
 can occasionally occur if the prescale or preload registers are currently busy
 loading a previous value.
 
-@param[in] period uint32_t Period in milliseconds (< 32760) from a watchdog reset
-until a system reset is issued.
+@param[in] period uint32_t Period in milliseconds (< 32760) from a watchdog
+reset until a system reset is issued.
 */
 
 void iwdg_set_period_ms(uint32_t period)
diff --git a/lib/stm32/common/spi_common_all.c b/lib/stm32/common/spi_common_all.c
index 00aead69..b8567485 100644
--- a/lib/stm32/common/spi_common_all.c
+++ b/lib/stm32/common/spi_common_all.c
@@ -119,7 +119,8 @@ spi_lsbfirst.
 @returns int. Error code.
 */
 
-int spi_init_master(uint32_t spi, uint32_t br, uint32_t cpol, uint32_t cpha, uint32_t dff, uint32_t lsbfirst)
+int spi_init_master(uint32_t spi, uint32_t br, uint32_t cpol, uint32_t cpha,
+		    uint32_t dff, uint32_t lsbfirst)
 {
 	uint32_t reg32 = SPI_CR1(spi);
 
diff --git a/lib/stm32/common/timer_common_all.c b/lib/stm32/common/timer_common_all.c
index fbce4970..6cbc4c7c 100644
--- a/lib/stm32/common/timer_common_all.c
+++ b/lib/stm32/common/timer_common_all.c
@@ -1444,7 +1444,8 @@ tim_reg_base
 		timers 1 and 8)
 */
 
-void timer_set_oc_idle_state_set(uint32_t timer_peripheral, enum tim_oc_id oc_id)
+void timer_set_oc_idle_state_set(uint32_t timer_peripheral,
+				 enum tim_oc_id oc_id)
 {
 #if (defined(TIM1_BASE) || defined(TIM8_BASE))
 	/* Acting for TIM1 and TIM8 only. */
@@ -1496,7 +1497,8 @@ tim_reg_base
 		timers 1 and 8)
 */
 
-void timer_set_oc_idle_state_unset(uint32_t timer_peripheral, enum tim_oc_id oc_id)
+void timer_set_oc_idle_state_unset(uint32_t timer_peripheral,
+				   enum tim_oc_id oc_id)
 {
 #if (defined(TIM1_BASE) || defined(TIM8_BASE))
 	/* Acting for TIM1 and TIM8 only. */
@@ -1546,7 +1548,8 @@ to the compare register.
 @param[in] value Unsigned int32. Compare value.
 */
 
-void timer_set_oc_value(uint32_t timer_peripheral, enum tim_oc_id oc_id, uint32_t value)
+void timer_set_oc_value(uint32_t timer_peripheral, enum tim_oc_id oc_id,
+			uint32_t value)
 {
 	switch (oc_id) {
 	case TIM_OC1:
diff --git a/lib/stm32/f1/adc.c b/lib/stm32/f1/adc.c
index 0447f03b..2c90bcdb 100644
--- a/lib/stm32/f1/adc.c
+++ b/lib/stm32/f1/adc.c
@@ -490,7 +490,8 @@ adc_reg_base.
 @param[in] channel Unsigned int8. ADC channel number @ref adc_watchdog_channel.
 */
 
-void adc_enable_analog_watchdog_on_selected_channel(uint32_t adc, uint8_t channel)
+void adc_enable_analog_watchdog_on_selected_channel(uint32_t adc,
+						    uint8_t channel)
 {
 	uint32_t reg32;
 
diff --git a/lib/stm32/f2/rcc.c b/lib/stm32/f2/rcc.c
index b93249a7..3e766338 100644
--- a/lib/stm32/f2/rcc.c
+++ b/lib/stm32/f2/rcc.c
@@ -338,7 +338,8 @@ void rcc_set_rtcpre(uint32_t rtcpre)
 	RCC_CFGR = (reg32 | (rtcpre << 16));
 }
 
-void rcc_set_main_pll_hsi(uint32_t pllm, uint32_t plln, uint32_t pllp, uint32_t pllq)
+void rcc_set_main_pll_hsi(uint32_t pllm, uint32_t plln, uint32_t pllp,
+			  uint32_t pllq)
 {
 	RCC_PLLCFGR = (pllm << RCC_PLLCFGR_PLLM_SHIFT) |
 		(plln << RCC_PLLCFGR_PLLN_SHIFT) |
@@ -346,7 +347,8 @@ void rcc_set_main_pll_hsi(uint32_t pllm, uint32_t plln, uint32_t pllp, uint32_t
 		(pllq << RCC_PLLCFGR_PLLQ_SHIFT);
 }
 
-void rcc_set_main_pll_hse(uint32_t pllm, uint32_t plln, uint32_t pllp, uint32_t pllq)
+void rcc_set_main_pll_hse(uint32_t pllm, uint32_t plln, uint32_t pllp,
+			  uint32_t pllq)
 {
 	RCC_PLLCFGR = (pllm << RCC_PLLCFGR_PLLM_SHIFT) |
 		(plln << RCC_PLLCFGR_PLLN_SHIFT) |
diff --git a/lib/stm32/f4/adc.c b/lib/stm32/f4/adc.c
index 37f3c35f..2ad1115b 100644
--- a/lib/stm32/f4/adc.c
+++ b/lib/stm32/f4/adc.c
@@ -278,7 +278,8 @@ adc_enable_analog_watchdog_regular.
 @param[in] channel Unsigned int8. ADC channel number @ref adc_watchdog_channel
 */
 
-void adc_enable_analog_watchdog_on_selected_channel(uint32_t adc, uint8_t channel)
+void adc_enable_analog_watchdog_on_selected_channel(uint32_t adc,
+						    uint8_t channel)
 {
 	uint32_t reg32;
 
@@ -809,7 +810,8 @@ the trigger polarity is zero, triggering is disabled.
 adc_trigger_polarity_regular
 */
 
-void adc_enable_external_trigger_regular(uint32_t adc, uint32_t trigger, uint32_t polarity)
+void adc_enable_external_trigger_regular(uint32_t adc, uint32_t trigger,
+					 uint32_t polarity)
 {
 	uint32_t reg32 = ADC_CR2(adc);
 
@@ -841,7 +843,8 @@ the polarity of the trigger event: rising or falling edge or both.
 adc_trigger_polarity_injected
 */
 
-void adc_enable_external_trigger_injected(uint32_t adc, uint32_t trigger, uint32_t polarity)
+void adc_enable_external_trigger_injected(uint32_t adc, uint32_t trigger,
+					  uint32_t polarity)
 {
 	uint32_t reg32 = ADC_CR2(adc);
 
diff --git a/lib/stm32/f4/rcc.c b/lib/stm32/f4/rcc.c
index 16b34eb1..0a9f0d50 100644
--- a/lib/stm32/f4/rcc.c
+++ b/lib/stm32/f4/rcc.c
@@ -455,7 +455,8 @@ void rcc_set_rtcpre(uint32_t rtcpre)
 	RCC_CFGR = (reg32 | (rtcpre << 16));
 }
 
-void rcc_set_main_pll_hsi(uint32_t pllm, uint32_t plln, uint32_t pllp, uint32_t pllq)
+void rcc_set_main_pll_hsi(uint32_t pllm, uint32_t plln, uint32_t pllp,
+			  uint32_t pllq)
 {
 	RCC_PLLCFGR = (pllm << RCC_PLLCFGR_PLLM_SHIFT) |
 		(plln << RCC_PLLCFGR_PLLN_SHIFT) |
@@ -463,7 +464,8 @@ void rcc_set_main_pll_hsi(uint32_t pllm, uint32_t plln, uint32_t pllp, uint32_t
 		(pllq << RCC_PLLCFGR_PLLQ_SHIFT);
 }
 
-void rcc_set_main_pll_hse(uint32_t pllm, uint32_t plln, uint32_t pllp, uint32_t pllq)
+void rcc_set_main_pll_hse(uint32_t pllm, uint32_t plln, uint32_t pllp,
+			  uint32_t pllq)
 {
 	RCC_PLLCFGR = (pllm << RCC_PLLCFGR_PLLM_SHIFT) |
 		(plln << RCC_PLLCFGR_PLLN_SHIFT) |
diff --git a/lib/stm32/l1/rcc.c b/lib/stm32/l1/rcc.c
index 8094b729..34083c08 100644
--- a/lib/stm32/l1/rcc.c
+++ b/lib/stm32/l1/rcc.c
@@ -375,7 +375,8 @@ void rcc_set_sysclk_source(uint32_t clk)
 	RCC_CFGR = (reg32 | clk);
 }
 
-void rcc_set_pll_configuration(uint32_t source, uint32_t multiplier, uint32_t divisor)
+void rcc_set_pll_configuration(uint32_t source, uint32_t multiplier,
+			       uint32_t divisor)
 {
 	uint32_t reg32;
 
diff --git a/lib/usb/usb.c b/lib/usb/usb.c
index 2183ebe3..78637363 100644
--- a/lib/usb/usb.c
+++ b/lib/usb/usb.c
@@ -137,7 +137,8 @@ void usbd_disconnect(usbd_device *usbd_dev, bool disconnected)
 	}
 }
 
-void usbd_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type, uint16_t max_size,
+void usbd_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type,
+		   uint16_t max_size,
 		   void (*callback)(usbd_device *usbd_dev, uint8_t ep))
 {
 	usbd_dev->driver->ep_setup(usbd_dev, addr, type, max_size, callback);
@@ -149,7 +150,8 @@ uint16_t usbd_ep_write_packet(usbd_device *usbd_dev, uint8_t addr,
 	return usbd_dev->driver->ep_write_packet(usbd_dev, addr, buf, len);
 }
 
-uint16_t usbd_ep_read_packet(usbd_device *usbd_dev, uint8_t addr, void *buf, uint16_t len)
+uint16_t usbd_ep_read_packet(usbd_device *usbd_dev, uint8_t addr, void *buf,
+			     uint16_t len)
 {
 	return usbd_dev->driver->ep_read_packet(usbd_dev, addr, buf, len);
 }
diff --git a/lib/usb/usb_control.c b/lib/usb/usb_control.c
index efd16917..42a58420 100644
--- a/lib/usb/usb_control.c
+++ b/lib/usb/usb_control.c
@@ -40,7 +40,8 @@ LGPL License Terms @ref lgpl_license
 #include "usb_private.h"
 
 /* Register application callback function for handling USB control requests. */
-int usbd_register_control_callback(usbd_device *usbd_dev, uint8_t type, uint8_t type_mask,
+int usbd_register_control_callback(usbd_device *usbd_dev, uint8_t type,
+				   uint8_t type_mask,
 				   usbd_control_callback callback)
 {
 	int i;
diff --git a/lib/usb/usb_f103.c b/lib/usb/usb_f103.c
index f81b0b86..97191035 100644
--- a/lib/usb/usb_f103.c
+++ b/lib/usb/usb_f103.c
@@ -26,17 +26,20 @@
 
 static usbd_device *stm32f103_usbd_init(void);
 static void stm32f103_set_address(usbd_device *usbd_dev, uint8_t addr);
-static void stm32f103_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type,
-			       uint16_t max_size,
-			       void (*callback) (usbd_device *usbd_dev, uint8_t ep));
+static void stm32f103_ep_setup(usbd_device *usbd_dev, uint8_t addr,
+			       uint8_t type, uint16_t max_size,
+			       void (*callback) (usbd_device *usbd_dev,
+						 uint8_t ep));
 static void stm32f103_endpoints_reset(usbd_device *usbd_dev);
-static void stm32f103_ep_stall_set(usbd_device *usbd_dev, uint8_t addr, uint8_t stall);
+static void stm32f103_ep_stall_set(usbd_device *usbd_dev, uint8_t addr,
+				   uint8_t stall);
 static uint8_t stm32f103_ep_stall_get(usbd_device *usbd_dev, uint8_t addr);
-static void stm32f103_ep_nak_set(usbd_device *usbd_dev, uint8_t addr, uint8_t nak);
+static void stm32f103_ep_nak_set(usbd_device *usbd_dev, uint8_t addr,
+				 uint8_t nak);
 static uint16_t stm32f103_ep_write_packet(usbd_device *usbd_dev, uint8_t addr,
 				     const void *buf, uint16_t len);
-static uint16_t stm32f103_ep_read_packet(usbd_device *usbd_dev, uint8_t addr, void *buf,
-				    uint16_t len);
+static uint16_t stm32f103_ep_read_packet(usbd_device *usbd_dev, uint8_t addr,
+					 void *buf, uint16_t len);
 static void stm32f103_poll(usbd_device *usbd_dev);
 
 static uint8_t force_nak[8];
@@ -100,7 +103,8 @@ static void usb_set_ep_rx_bufsize(usbd_device *dev, uint8_t ep, uint32_t size)
 
 static void stm32f103_ep_setup(usbd_device *dev, uint8_t addr, uint8_t type,
 			       uint16_t max_size,
-			       void (*callback) (usbd_device *usbd_dev, uint8_t ep))
+			       void (*callback) (usbd_device *usbd_dev,
+						 uint8_t ep))
 {
 	/* Translate USB standard type codes to STM32. */
 	const uint16_t typelookup[] = {
@@ -152,7 +156,8 @@ static void stm32f103_endpoints_reset(usbd_device *dev)
 	dev->pm_top = 0x40 + (2 * dev->desc->bMaxPacketSize0);
 }
 
-static void stm32f103_ep_stall_set(usbd_device *dev, uint8_t addr, uint8_t stall)
+static void stm32f103_ep_stall_set(usbd_device *dev, uint8_t addr,
+				   uint8_t stall)
 {
 	(void)dev;
 	if (addr == 0) {
@@ -269,8 +274,8 @@ static void usb_copy_from_pm(void *buf, const volatile void *vPM, uint16_t len)
 	}
 }
 
-static uint16_t stm32f103_ep_read_packet(usbd_device *dev, uint8_t addr, void *buf,
-				    uint16_t len)
+static uint16_t stm32f103_ep_read_packet(usbd_device *dev, uint8_t addr,
+					 void *buf, uint16_t len)
 {
 	(void)dev;
 	if ((*USB_EP_REG(addr) & USB_EP_RX_STAT) == USB_EP_RX_STAT_VALID) {
diff --git a/lib/usb/usb_fx07_common.c b/lib/usb/usb_fx07_common.c
index f07d0ed5..277c35d9 100644
--- a/lib/usb/usb_fx07_common.c
+++ b/lib/usb/usb_fx07_common.c
@@ -31,15 +31,17 @@
  * according to the selected cores base address. */
 #define dev_base_address (usbd_dev->driver->base_address)
 #define REBASE(x)        MMIO32((x)+(dev_base_address))
-#define REBASE_FIFO(x)   ((volatile uint32_t*)((dev_base_address) + (OTG_FIFO(x))))
+#define REBASE_FIFO(x)   ((volatile uint32_t*)((dev_base_address) \
+			                       + (OTG_FIFO(x))))
 
 void stm32fx07_set_address(usbd_device *usbd_dev, uint8_t addr)
 {
 	REBASE(OTG_DCFG) = (REBASE(OTG_DCFG) & ~OTG_FS_DCFG_DAD) | (addr << 4);
 }
 
-void stm32fx07_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type, uint16_t max_size,
-			       void (*callback) (usbd_device *usbd_dev, uint8_t ep))
+void stm32fx07_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type,
+			uint16_t max_size,
+			void (*callback) (usbd_device *usbd_dev, uint8_t ep))
 {
 	/*
 	 * Configure endpoint address and type. Allocate FIFO memory for
@@ -204,7 +206,8 @@ uint16_t stm32fx07_ep_write_packet(usbd_device *usbd_dev, uint8_t addr,
 	return len;
 }
 
-uint16_t stm32fx07_ep_read_packet(usbd_device *usbd_dev, uint8_t addr, void *buf, uint16_t len)
+uint16_t stm32fx07_ep_read_packet(usbd_device *usbd_dev, uint8_t addr,
+				  void *buf, uint16_t len)
 {
 	int i;
 	uint32_t *buf32 = buf;
@@ -294,7 +297,8 @@ void stm32fx07_poll(usbd_device *usbd_dev)
 	for (i = 0; i < 4; i++) { /* Iterate over endpoints. */
 		if (REBASE(OTG_DIEPINT(i)) & OTG_FS_DIEPINTX_XFRC) {
 			/* Transfer complete. */
-			if (usbd_dev->user_callback_ctr[i][USB_TRANSACTION_IN]) {
+			if (usbd_dev->user_callback_ctr[i]
+						       [USB_TRANSACTION_IN]) {
 				usbd_dev->user_callback_ctr[i]
 					[USB_TRANSACTION_IN](usbd_dev, i);
 			}
diff --git a/lib/usb/usb_fx07_common.h b/lib/usb/usb_fx07_common.h
index 0ecec158..31c40304 100644
--- a/lib/usb/usb_fx07_common.h
+++ b/lib/usb/usb_fx07_common.h
@@ -21,16 +21,17 @@
 #define __USB_FX07_COMMON_H_
 
 void stm32fx07_set_address(usbd_device *usbd_dev, uint8_t addr);
-void stm32fx07_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type, uint16_t max_size,
-			       void (*callback)(usbd_device *usbd_dev, uint8_t ep));
+void stm32fx07_ep_setup(usbd_device *usbd_dev, uint8_t addr, uint8_t type,
+			uint16_t max_size,
+			void (*callback)(usbd_device *usbd_dev, uint8_t ep));
 void stm32fx07_endpoints_reset(usbd_device *usbd_dev);
 void stm32fx07_ep_stall_set(usbd_device *usbd_dev, uint8_t addr, uint8_t stall);
 uint8_t stm32fx07_ep_stall_get(usbd_device *usbd_dev, uint8_t addr);
 void stm32fx07_ep_nak_set(usbd_device *usbd_dev, uint8_t addr, uint8_t nak);
-uint16_t stm32fx07_ep_write_packet(usbd_device *usbd_dev, uint8_t addr, const void *buf,
-			      uint16_t len);
-uint16_t stm32fx07_ep_read_packet(usbd_device *usbd_dev, uint8_t addr, void *buf,
-			     uint16_t len);
+uint16_t stm32fx07_ep_write_packet(usbd_device *usbd_dev, uint8_t addr,
+				   const void *buf, uint16_t len);
+uint16_t stm32fx07_ep_read_packet(usbd_device *usbd_dev, uint8_t addr,
+				  void *buf, uint16_t len);
 void stm32fx07_poll(usbd_device *usbd_dev);
 void stm32fx07_disconnect(usbd_device *usbd_dev, bool disconnected);
 
diff --git a/lib/usb/usb_private.h b/lib/usb/usb_private.h
index 730f4b5e..802f7c67 100644
--- a/lib/usb/usb_private.h
+++ b/lib/usb/usb_private.h
@@ -6,7 +6,8 @@
 
 @version 1.0.0
 
-@author @htmlonly &copy; @endhtmlonly 2010 Gareth McMullin <gareth@blacksphere.co.nz>
+@author @htmlonly &copy; @endhtmlonly 2010
+Gareth McMullin <gareth@blacksphere.co.nz>
 
 @date 10 March 2013
 
@@ -84,7 +85,8 @@ struct _usbd_device {
 	void (*user_callback_ctr[8][3])(usbd_device *usbd_dev, uint8_t ea);
 
 	/* User callback function for some standard USB function hooks */
-	void (*user_callback_set_config)(usbd_device *usbd_dev, uint16_t wValue);
+	void (*user_callback_set_config)(usbd_device *usbd_dev,
+					 uint16_t wValue);
 
 	const struct _usbd_driver *driver;
 
@@ -137,16 +139,18 @@ void _usbd_reset(usbd_device *usbd_dev);
 struct _usbd_driver {
 	usbd_device *(*init)(void);
 	void (*set_address)(usbd_device *usbd_dev, uint8_t addr);
-	void (*ep_setup)(usbd_device *usbd_dev, uint8_t addr, uint8_t type, uint16_t max_size,
+	void (*ep_setup)(usbd_device *usbd_dev, uint8_t addr, uint8_t type,
+			 uint16_t max_size,
 			 void (*cb)(usbd_device *usbd_dev, uint8_t ep));
 	void (*ep_reset)(usbd_device *usbd_dev);
-	void (*ep_stall_set)(usbd_device *usbd_dev, uint8_t addr, uint8_t stall);
+	void (*ep_stall_set)(usbd_device *usbd_dev, uint8_t addr,
+			     uint8_t stall);
 	void (*ep_nak_set)(usbd_device *usbd_dev, uint8_t addr, uint8_t nak);
 	uint8_t (*ep_stall_get)(usbd_device *usbd_dev, uint8_t addr);
-	uint16_t (*ep_write_packet)(usbd_device *usbd_dev, uint8_t addr, const void *buf,
-			       uint16_t len);
-	uint16_t (*ep_read_packet)(usbd_device *usbd_dev, uint8_t addr, void *buf,
-			      uint16_t len);
+	uint16_t (*ep_write_packet)(usbd_device *usbd_dev, uint8_t addr,
+				    const void *buf, uint16_t len);
+	uint16_t (*ep_read_packet)(usbd_device *usbd_dev, uint8_t addr,
+				   void *buf, uint16_t len);
 	void (*poll)(usbd_device *usbd_dev);
 	void (*disconnect)(usbd_device *usbd_dev, bool disconnected);
 	uint32_t base_address;
diff --git a/lib/usb/usb_standard.c b/lib/usb/usb_standard.c
index e43d57ee..0cf7f86e 100644
--- a/lib/usb/usb_standard.c
+++ b/lib/usb/usb_standard.c
@@ -377,8 +377,8 @@ int _usbd_standard_request_device(usbd_device *usbd_dev,
 				  struct usb_setup_data *req, uint8_t **buf,
 				  uint16_t *len)
 {
-	int (*command)(usbd_device *usbd_dev, struct usb_setup_data *req, uint8_t
-		       **buf, uint16_t *len) = NULL;
+	int (*command)(usbd_device *usbd_dev, struct usb_setup_data *req,
+		       uint8_t **buf, uint16_t *len) = NULL;
 
 	switch (req->bRequest) {
 	case USB_REQ_CLEAR_FEATURE:
@@ -494,8 +494,8 @@ int _usbd_standard_request_endpoint(usbd_device *usbd_dev,
 	return command(usbd_dev, req, buf, len);
 }
 
-int _usbd_standard_request(usbd_device *usbd_dev,
-			   struct usb_setup_data *req, uint8_t **buf, uint16_t *len)
+int _usbd_standard_request(usbd_device *usbd_dev, struct usb_setup_data *req,
+			   uint8_t **buf, uint16_t *len)
 {
 	/* FIXME: Have class/vendor requests as well. */
 	if ((req->bmRequestType & USB_REQ_TYPE_TYPE) != USB_REQ_TYPE_STANDARD) {