Clang-tidy fixes

8 files changed, 84 insertions, 160 deletions

diff --git a/include/arch/x86_64/linux/usb/audio.h b/include/arch/x86_64/linux/usb/audio.h
index 6f54d12f..43bb09a1 100644
--- a/include/arch/x86_64/linux/usb/audio.h
+++ b/include/arch/x86_64/linux/usb/audio.h
@@ -264,37 +264,27 @@ struct uac_mixer_unit_descriptor {
 	__u8 baSourceID[];
 } __attribute__((packed));
 
-static __inline__ __u8
-uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc)
+static __inline__ __u8 uac_mixer_unit_bNrChannels(struct uac_mixer_unit_descriptor *desc)
 {
 	return desc->baSourceID[desc->bNrInPins];
 }
 
-static __inline__ __u32
-uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descriptor *desc,
-			      int protocol)
+static __inline__ __u32 uac_mixer_unit_wChannelConfig(struct uac_mixer_unit_descriptor *desc, int protocol)
 {
 	if (protocol == UAC_VERSION_1)
-		return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
-		       desc->baSourceID[desc->bNrInPins + 1];
+		return (desc->baSourceID[desc->bNrInPins + 2] << 8) | desc->baSourceID[desc->bNrInPins + 1];
 	else
-		return (desc->baSourceID[desc->bNrInPins + 4] << 24) |
-		       (desc->baSourceID[desc->bNrInPins + 3] << 16) |
-		       (desc->baSourceID[desc->bNrInPins + 2] << 8) |
-		       (desc->baSourceID[desc->bNrInPins + 1]);
+		return (desc->baSourceID[desc->bNrInPins + 4] << 24) | (desc->baSourceID[desc->bNrInPins + 3] << 16) |
+		       (desc->baSourceID[desc->bNrInPins + 2] << 8) | (desc->baSourceID[desc->bNrInPins + 1]);
 }
 
-static __inline__ __u8
-uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor *desc,
-			     int protocol)
+static __inline__ __u8 uac_mixer_unit_iChannelNames(struct uac_mixer_unit_descriptor *desc, int protocol)
 {
-	return (protocol == UAC_VERSION_1) ?
-		       desc->baSourceID[desc->bNrInPins + 3] :
-		       desc->baSourceID[desc->bNrInPins + 5];
+	return (protocol == UAC_VERSION_1) ? desc->baSourceID[desc->bNrInPins + 3] :
+					     desc->baSourceID[desc->bNrInPins + 5];
 }
 
-static __inline__ __u8 *
-uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc, int protocol)
+static __inline__ __u8 *uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc, int protocol)
 {
 	switch (protocol) {
 	case UAC_VERSION_1:
@@ -308,15 +298,12 @@ uac_mixer_unit_bmControls(struct uac_mixer_unit_descriptor *desc, int protocol)
 	}
 }
 
-static __inline__ __u16
-uac3_mixer_unit_wClusterDescrID(struct uac_mixer_unit_descriptor *desc)
+static __inline__ __u16 uac3_mixer_unit_wClusterDescrID(struct uac_mixer_unit_descriptor *desc)
 {
-	return (desc->baSourceID[desc->bNrInPins + 1] << 8) |
-	       desc->baSourceID[desc->bNrInPins];
+	return (desc->baSourceID[desc->bNrInPins + 1] << 8) | desc->baSourceID[desc->bNrInPins];
 }
 
-static __inline__ __u8
-uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)
+static __inline__ __u8 uac_mixer_unit_iMixer(struct uac_mixer_unit_descriptor *desc)
 {
 	__u8 *raw = (__u8 *)desc;
 	return raw[desc->bLength - 1];
@@ -332,8 +319,7 @@ struct uac_selector_unit_descriptor {
 	__u8 baSourceID[];
 } __attribute__((packed));
 
-static __inline__ __u8
-uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
+static __inline__ __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
 {
 	__u8 *raw = (__u8 *)desc;
 	return raw[desc->bLength - 1];
@@ -350,8 +336,7 @@ struct uac_feature_unit_descriptor {
 	__u8 bmaControls[]; /* variable length */
 } __attribute__((packed));
 
-static __inline__ __u8
-uac_feature_unit_iFeature(struct uac_feature_unit_descriptor *desc)
+static __inline__ __u8 uac_feature_unit_iFeature(struct uac_feature_unit_descriptor *desc)
 {
 	__u8 *raw = (__u8 *)desc;
 	return raw[desc->bLength - 1];
@@ -368,38 +353,27 @@ struct uac_processing_unit_descriptor {
 	__u8 baSourceID[];
 } __attribute__((packed));
 
-static __inline__ __u8
-uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc)
+static __inline__ __u8 uac_processing_unit_bNrChannels(struct uac_processing_unit_descriptor *desc)
 {
 	return desc->baSourceID[desc->bNrInPins];
 }
 
-static __inline__ __u32
-uac_processing_unit_wChannelConfig(struct uac_processing_unit_descriptor *desc,
-				   int protocol)
+static __inline__ __u32 uac_processing_unit_wChannelConfig(struct uac_processing_unit_descriptor *desc, int protocol)
 {
 	if (protocol == UAC_VERSION_1)
-		return (desc->baSourceID[desc->bNrInPins + 2] << 8) |
-		       desc->baSourceID[desc->bNrInPins + 1];
+		return (desc->baSourceID[desc->bNrInPins + 2] << 8) | desc->baSourceID[desc->bNrInPins + 1];
 	else
-		return (desc->baSourceID[desc->bNrInPins + 4] << 24) |
-		       (desc->baSourceID[desc->bNrInPins + 3] << 16) |
-		       (desc->baSourceID[desc->bNrInPins + 2] << 8) |
-		       (desc->baSourceID[desc->bNrInPins + 1]);
+		return (desc->baSourceID[desc->bNrInPins + 4] << 24) | (desc->baSourceID[desc->bNrInPins + 3] << 16) |
+		       (desc->baSourceID[desc->bNrInPins + 2] << 8) | (desc->baSourceID[desc->bNrInPins + 1]);
 }
 
-static __inline__ __u8
-uac_processing_unit_iChannelNames(struct uac_processing_unit_descriptor *desc,
-				  int protocol)
+static __inline__ __u8 uac_processing_unit_iChannelNames(struct uac_processing_unit_descriptor *desc, int protocol)
 {
-	return (protocol == UAC_VERSION_1) ?
-		       desc->baSourceID[desc->bNrInPins + 3] :
-		       desc->baSourceID[desc->bNrInPins + 5];
+	return (protocol == UAC_VERSION_1) ? desc->baSourceID[desc->bNrInPins + 3] :
+					     desc->baSourceID[desc->bNrInPins + 5];
 }
 
-static __inline__ __u8
-uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
-				 int protocol)
+static __inline__ __u8 uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc, int protocol)
 {
 	switch (protocol) {
 	case UAC_VERSION_1:
@@ -413,9 +387,7 @@ uac_processing_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
 	}
 }
 
-static __inline__ __u8 *
-uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc,
-			       int protocol)
+static __inline__ __u8 *uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc, int protocol)
 {
 	switch (protocol) {
 	case UAC_VERSION_1:
@@ -429,9 +401,7 @@ uac_processing_unit_bmControls(struct uac_processing_unit_descriptor *desc,
 	}
 }
 
-static __inline__ __u8
-uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc,
-				int protocol)
+static __inline__ __u8 uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc, int protocol)
 {
 	__u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
 
@@ -439,16 +409,13 @@ uac_processing_unit_iProcessing(struct uac_processing_unit_descriptor *desc,
 	case UAC_VERSION_1:
 	case UAC_VERSION_2:
 	default:
-		return *(uac_processing_unit_bmControls(desc, protocol) +
-			 control_size);
+		return *(uac_processing_unit_bmControls(desc, protocol) + control_size);
 	case UAC_VERSION_3:
 		return 0; /* UAC3 does not have this field */
 	}
 }
 
-static __inline__ __u8 *
-uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc,
-			     int protocol)
+static __inline__ __u8 *uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc, int protocol)
 {
 	__u8 control_size = uac_processing_unit_bControlSize(desc, protocol);
 
@@ -456,11 +423,9 @@ uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc,
 	case UAC_VERSION_1:
 	case UAC_VERSION_2:
 	default:
-		return uac_processing_unit_bmControls(desc, protocol) +
-		       control_size + 1;
+		return uac_processing_unit_bmControls(desc, protocol) + control_size + 1;
 	case UAC_VERSION_3:
-		return uac_processing_unit_bmControls(desc, protocol) +
-		       control_size;
+		return uac_processing_unit_bmControls(desc, protocol) + control_size;
 	}
 }
 
@@ -470,9 +435,7 @@ uac_processing_unit_specific(struct uac_processing_unit_descriptor *desc,
  * XU while 2 bytes for PU.  The last iExtension field is a one-byte index as
  * well as iProcessing field of PU.
  */
-static __inline__ __u8
-uac_extension_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
-				int protocol)
+static __inline__ __u8 uac_extension_unit_bControlSize(struct uac_processing_unit_descriptor *desc, int protocol)
 {
 	switch (protocol) {
 	case UAC_VERSION_1:
@@ -486,9 +449,7 @@ uac_extension_unit_bControlSize(struct uac_processing_unit_descriptor *desc,
 	}
 }
 
-static __inline__ __u8
-uac_extension_unit_iExtension(struct uac_processing_unit_descriptor *desc,
-			      int protocol)
+static __inline__ __u8 uac_extension_unit_iExtension(struct uac_processing_unit_descriptor *desc, int protocol)
 {
 	__u8 control_size = uac_extension_unit_bControlSize(desc, protocol);
 
@@ -496,8 +457,7 @@ uac_extension_unit_iExtension(struct uac_processing_unit_descriptor *desc,
 	case UAC_VERSION_1:
 	case UAC_VERSION_2:
 	default:
-		return *(uac_processing_unit_bmControls(desc, protocol) +
-			 control_size);
+		return *(uac_processing_unit_bmControls(desc, protocol) + control_size);
 	case UAC_VERSION_3:
 		return 0; /* UAC3 does not have this field */
 	}
diff --git a/include/arch/x86_64/linux/usb/cdc.h b/include/arch/x86_64/linux/usb/cdc.h
index 32ae0b7a..14fd53e5 100644
--- a/include/arch/x86_64/linux/usb/cdc.h
+++ b/include/arch/x86_64/linux/usb/cdc.h
@@ -375,10 +375,8 @@ struct usb_cdc_ncm_nth32 {
 #define USB_CDC_NCM_NDP32_CRC_SIGN   0x316D636E /* ncm1 */
 #define USB_CDC_NCM_NDP32_NOCRC_SIGN 0x306D636E /* ncm0 */
 
-#define USB_CDC_MBIM_NDP16_IPS_SIGN \
-	0x00535049 /* IPS<sessionID> : IPS0 for now */
-#define USB_CDC_MBIM_NDP32_IPS_SIGN \
-	0x00737069 /* ips<sessionID> : ips0 for now */
+#define USB_CDC_MBIM_NDP16_IPS_SIGN 0x00535049 /* IPS<sessionID> : IPS0 for now */
+#define USB_CDC_MBIM_NDP32_IPS_SIGN 0x00737069 /* ips<sessionID> : ips0 for now */
 #define USB_CDC_MBIM_NDP16_DSS_SIGN 0x00535344 /* DSS<sessionID> */
 #define USB_CDC_MBIM_NDP32_DSS_SIGN 0x00737364 /* dss<sessionID> */
 
diff --git a/include/arch/x86_64/linux/usb/ch11.h b/include/arch/x86_64/linux/usb/ch11.h
index f47ba10f..0773174d 100644
--- a/include/arch/x86_64/linux/usb/ch11.h
+++ b/include/arch/x86_64/linux/usb/ch11.h
@@ -144,9 +144,8 @@ struct usb_port_status {
 #define USB_PORT_STAT_SPEED_5GBPS 0x0000
 /* Valid only if port is enabled */
 /* Bits that are the same from USB 2.0 */
-#define USB_SS_PORT_STAT_MASK                              \
-	(USB_PORT_STAT_CONNECTION | USB_PORT_STAT_ENABLE | \
-	 USB_PORT_STAT_OVERCURRENT | USB_PORT_STAT_RESET)
+#define USB_SS_PORT_STAT_MASK \
+	(USB_PORT_STAT_CONNECTION | USB_PORT_STAT_ENABLE | USB_PORT_STAT_OVERCURRENT | USB_PORT_STAT_RESET)
 
 /*
  * Definitions for PORT_LINK_STATE values
diff --git a/include/arch/x86_64/linux/usb/ch9.h b/include/arch/x86_64/linux/usb/ch9.h
index 19b44287..f62ffe01 100644
--- a/include/arch/x86_64/linux/usb/ch9.h
+++ b/include/arch/x86_64/linux/usb/ch9.h
@@ -444,8 +444,7 @@ struct usb_endpoint_descriptor {
 #define USB_ENDPOINT_MAXP_MASK 0x07ff
 #define USB_EP_MAXP_MULT_SHIFT 11
 #define USB_EP_MAXP_MULT_MASK  (3 << USB_EP_MAXP_MULT_SHIFT)
-#define USB_EP_MAXP_MULT(m) \
-	(((m) & USB_EP_MAXP_MULT_MASK) >> USB_EP_MAXP_MULT_SHIFT)
+#define USB_EP_MAXP_MULT(m)    (((m) & USB_EP_MAXP_MULT_MASK) >> USB_EP_MAXP_MULT_SHIFT)
 
 /* The USB 3.0 spec redefines bits 5:4 of bmAttributes as interrupt ep type. */
 #define USB_ENDPOINT_INTRTYPE	       0x30
@@ -458,11 +457,10 @@ struct usb_endpoint_descriptor {
 #define USB_ENDPOINT_SYNC_ADAPTIVE (2 << 2)
 #define USB_ENDPOINT_SYNC_SYNC	   (3 << 2)
 
-#define USB_ENDPOINT_USAGE_MASK	    0x30
-#define USB_ENDPOINT_USAGE_DATA	    0x00
-#define USB_ENDPOINT_USAGE_FEEDBACK 0x10
-#define USB_ENDPOINT_USAGE_IMPLICIT_FB \
-	0x20 /* Implicit feedback Data endpoint */
+#define USB_ENDPOINT_USAGE_MASK	       0x30
+#define USB_ENDPOINT_USAGE_DATA	       0x00
+#define USB_ENDPOINT_USAGE_FEEDBACK    0x10
+#define USB_ENDPOINT_USAGE_IMPLICIT_FB 0x20 /* Implicit feedback Data endpoint */
 
 /*-------------------------------------------------------------------------*/
 
@@ -472,8 +470,7 @@ struct usb_endpoint_descriptor {
  *
  * Returns @epd's number: 0 to 15.
  */
-static __inline__ int
-usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
 {
 	return epd->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
 }
@@ -485,8 +482,7 @@ usb_endpoint_num(const struct usb_endpoint_descriptor *epd)
  * Returns one of USB_ENDPOINT_XFER_{CONTROL, ISOC, BULK, INT} according
  * to @epd's transfer type.
  */
-static __inline__ int
-usb_endpoint_type(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_type(const struct usb_endpoint_descriptor *epd)
 {
 	return epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
 }
@@ -497,8 +493,7 @@ usb_endpoint_type(const struct usb_endpoint_descriptor *epd)
  *
  * Returns true if the endpoint is of type IN, otherwise it returns false.
  */
-static __inline__ int
-usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
 {
 	return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN);
 }
@@ -509,8 +504,7 @@ usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
  *
  * Returns true if the endpoint is of type OUT, otherwise it returns false.
  */
-static __inline__ int
-usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd)
 {
 	return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT);
 }
@@ -521,11 +515,9 @@ usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd)
  *
  * Returns true if the endpoint is of type bulk, otherwise it returns false.
  */
-static __inline__ int
-usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *epd)
 {
-	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-		USB_ENDPOINT_XFER_BULK);
+	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK);
 }
 
 /**
@@ -534,11 +526,9 @@ usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *epd)
  *
  * Returns true if the endpoint is of type control, otherwise it returns false.
  */
-static __inline__ int
-usb_endpoint_xfer_control(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_xfer_control(const struct usb_endpoint_descriptor *epd)
 {
-	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-		USB_ENDPOINT_XFER_CONTROL);
+	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_CONTROL);
 }
 
 /**
@@ -548,11 +538,9 @@ usb_endpoint_xfer_control(const struct usb_endpoint_descriptor *epd)
  * Returns true if the endpoint is of type interrupt, otherwise it returns
  * false.
  */
-static __inline__ int
-usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd)
 {
-	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-		USB_ENDPOINT_XFER_INT);
+	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT);
 }
 
 /**
@@ -562,11 +550,9 @@ usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd)
  * Returns true if the endpoint is of type isochronous, otherwise it returns
  * false.
  */
-static __inline__ int
-usb_endpoint_xfer_isoc(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_xfer_isoc(const struct usb_endpoint_descriptor *epd)
 {
-	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-		USB_ENDPOINT_XFER_ISOC);
+	return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_ISOC);
 }
 
 /**
@@ -576,8 +562,7 @@ usb_endpoint_xfer_isoc(const struct usb_endpoint_descriptor *epd)
  * Returns true if the endpoint has bulk transfer type and IN direction,
  * otherwise it returns false.
  */
-static __inline__ int
-usb_endpoint_is_bulk_in(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_is_bulk_in(const struct usb_endpoint_descriptor *epd)
 {
 	return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd);
 }
@@ -589,8 +574,7 @@ usb_endpoint_is_bulk_in(const struct usb_endpoint_descriptor *epd)
  * Returns true if the endpoint has bulk transfer type and OUT direction,
  * otherwise it returns false.
  */
-static __inline__ int
-usb_endpoint_is_bulk_out(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_is_bulk_out(const struct usb_endpoint_descriptor *epd)
 {
 	return usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd);
 }
@@ -602,8 +586,7 @@ usb_endpoint_is_bulk_out(const struct usb_endpoint_descriptor *epd)
  * Returns true if the endpoint has interrupt transfer type and IN direction,
  * otherwise it returns false.
  */
-static __inline__ int
-usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd)
 {
 	return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd);
 }
@@ -615,8 +598,7 @@ usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd)
  * Returns true if the endpoint has interrupt transfer type and OUT direction,
  * otherwise it returns false.
  */
-static __inline__ int
-usb_endpoint_is_int_out(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_is_int_out(const struct usb_endpoint_descriptor *epd)
 {
 	return usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd);
 }
@@ -628,8 +610,7 @@ usb_endpoint_is_int_out(const struct usb_endpoint_descriptor *epd)
  * Returns true if the endpoint has isochronous transfer type and IN direction,
  * otherwise it returns false.
  */
-static __inline__ int
-usb_endpoint_is_isoc_in(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_is_isoc_in(const struct usb_endpoint_descriptor *epd)
 {
 	return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd);
 }
@@ -641,8 +622,7 @@ usb_endpoint_is_isoc_in(const struct usb_endpoint_descriptor *epd)
  * Returns true if the endpoint has isochronous transfer type and OUT direction,
  * otherwise it returns false.
  */
-static __inline__ int
-usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor *epd)
 {
 	return usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd);
 }
@@ -653,8 +633,7 @@ usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor *epd)
  *
  * Returns @epd's max packet bits [10:0]
  */
-static __inline__ int
-usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
 {
 	return __le16_to_cpu(epd->wMaxPacketSize) & USB_ENDPOINT_MAXP_MASK;
 }
@@ -665,16 +644,14 @@ usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd)
  *
  * Return @epd's wMaxPacketSize[12:11] + 1
  */
-static __inline__ int
-usb_endpoint_maxp_mult(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_maxp_mult(const struct usb_endpoint_descriptor *epd)
 {
 	int maxp = __le16_to_cpu(epd->wMaxPacketSize);
 
 	return USB_EP_MAXP_MULT(maxp) + 1;
 }
 
-static __inline__ int
-usb_endpoint_interrupt_type(const struct usb_endpoint_descriptor *epd)
+static __inline__ int usb_endpoint_interrupt_type(const struct usb_endpoint_descriptor *epd)
 {
 	return epd->bmAttributes & USB_ENDPOINT_INTRTYPE;
 }
@@ -720,8 +697,7 @@ struct usb_ss_ep_comp_descriptor {
 #define USB_DT_SS_EP_COMP_SIZE 6
 
 /* Bits 4:0 of bmAttributes if this is a bulk endpoint */
-static __inline__ int
-usb_ss_max_streams(const struct usb_ss_ep_comp_descriptor *comp)
+static __inline__ int usb_ss_max_streams(const struct usb_ss_ep_comp_descriptor *comp)
 {
 	int max_streams;
 
@@ -983,8 +959,7 @@ struct usb_plat_dev_cap_descriptor {
 	__u8 CapabilityData[];
 } __attribute__((packed));
 
-#define USB_DT_USB_PLAT_DEV_CAP_SIZE(capability_data_size) \
-	(20 + capability_data_size)
+#define USB_DT_USB_PLAT_DEV_CAP_SIZE(capability_data_size) (20 + capability_data_size)
 
 /*
  * SuperSpeed Plus USB Capability descriptor: Defines the set of
@@ -1049,14 +1024,11 @@ struct usb_pd_cap_descriptor {
 	__u8 bDevCapabilityType; /* set to USB_PD_POWER_DELIVERY_CAPABILITY */
 	__u8 bReserved;
 	__le32 bmAttributes;
-#define USB_PD_CAP_BATTERY_CHARGING \
-	(1 << 1) /* supports Battery Charging specification */
-#define USB_PD_CAP_USB_PD \
-	(1 << 2) /* supports USB Power Delivery specification */
-#define USB_PD_CAP_PROVIDER (1 << 3) /* can provide power */
-#define USB_PD_CAP_CONSUMER (1 << 4) /* can consume power */
-#define USB_PD_CAP_CHARGING_POLICY \
-	(1 << 5) /* supports CHARGING_POLICY feature */
+#define USB_PD_CAP_BATTERY_CHARGING (1 << 1) /* supports Battery Charging specification */
+#define USB_PD_CAP_USB_PD	    (1 << 2) /* supports USB Power Delivery specification */
+#define USB_PD_CAP_PROVIDER	    (1 << 3) /* can provide power */
+#define USB_PD_CAP_CONSUMER	    (1 << 4) /* can consume power */
+#define USB_PD_CAP_CHARGING_POLICY  (1 << 5) /* supports CHARGING_POLICY feature */
 #define USB_PD_CAP_TYPE_C_CURRENT                                         \
 	(1 << 6) /* supports power capabilities defined in the USB Type-C \
 		    Specification */
@@ -1116,8 +1088,8 @@ struct usb_pd_cap_consumer_port_descriptor {
 	__le16 wMaxVoltage;		    /* in 50mV units */
 	__u16 wReserved;
 	__le32 dwMaxOperatingPower; /* in 10 mW - operating at steady state */
-	__le32 dwMaxPeakPower;	   /* in 10mW units - operating at peak power */
-	__le32 dwMaxPeakPowerTime; /* in 100ms units - duration of peak */
+	__le32 dwMaxPeakPower;	    /* in 10mW units - operating at peak power */
+	__le32 dwMaxPeakPowerTime;  /* in 100ms units - duration of peak */
 #define USB_PD_CAP_CONSUMER_UNKNOWN_PEAK_POWER_TIME 0xffff
 } __attribute__((packed));
 
diff --git a/include/arch/x86_64/linux/usb/functionfs.h b/include/arch/x86_64/linux/usb/functionfs.h
index 7e43d6b3..e39b9877 100644
--- a/include/arch/x86_64/linux/usb/functionfs.h
+++ b/include/arch/x86_64/linux/usb/functionfs.h
@@ -96,8 +96,7 @@ struct usb_os_desc_header {
 struct usb_ext_compat_desc {
 	__u8 bFirstInterfaceNumber;
 	__u8 Reserved1;
-	__struct_group(/* no tag */, IDs, /* no attrs */, __u8 CompatibleID[8];
-		       __u8 SubCompatibleID[8];);
+	__struct_group(/* no tag */, IDs, /* no attrs */, __u8 CompatibleID[8]; __u8 SubCompatibleID[8];);
 	__u8 Reserved2[6];
 };
 
@@ -398,7 +397,6 @@ struct usb_functionfs_event {
  * for now. Returns zero on success, and a negative errno value on
  * error.
  */
-#define FUNCTIONFS_DMABUF_TRANSFER \
-	_IOW('g', 133, struct usb_ffs_dmabuf_transfer_req)
+#define FUNCTIONFS_DMABUF_TRANSFER _IOW('g', 133, struct usb_ffs_dmabuf_transfer_req)
 
 #endif /* __LINUX_FUNCTIONFS_H__ */
diff --git a/include/arch/x86_64/linux/usb/midi.h b/include/arch/x86_64/linux/usb/midi.h
index e8da478f..c9760b1b 100644
--- a/include/arch/x86_64/linux/usb/midi.h
+++ b/include/arch/x86_64/linux/usb/midi.h
@@ -71,7 +71,7 @@ struct usb_midi_out_jack_descriptor {
 	__u8 bJackID;
 	__u8 bNrInputPins;		   /* p */
 	struct usb_midi_source_pin pins[]; /* [p] */
-	/*__u8  iJack;  -- omitted due to variable-sized pins[] */
+					   /*__u8  iJack;  -- omitted due to variable-sized pins[] */
 } __attribute__((packed));
 
 #define USB_DT_MIDI_OUT_SIZE(p) (7 + 2 * (p))
diff --git a/include/arch/x86_64/linux/usb/tmc.h b/include/arch/x86_64/linux/usb/tmc.h
index 8497da59..e60178f4 100644
--- a/include/arch/x86_64/linux/usb/tmc.h
+++ b/include/arch/x86_64/linux/usb/tmc.h
@@ -81,17 +81,15 @@ struct usbtmc_message {
 #define USBTMC_IOCTL_ABORT_BULK_IN   _IO(USBTMC_IOC_NR, 4)
 #define USBTMC_IOCTL_CLEAR_OUT_HALT  _IO(USBTMC_IOC_NR, 6)
 #define USBTMC_IOCTL_CLEAR_IN_HALT   _IO(USBTMC_IOC_NR, 7)
-#define USBTMC_IOCTL_CTRL_REQUEST \
-	_IOWR(USBTMC_IOC_NR, 8, struct usbtmc_ctrlrequest)
-#define USBTMC_IOCTL_GET_TIMEOUT _IOR(USBTMC_IOC_NR, 9, __u32)
-#define USBTMC_IOCTL_SET_TIMEOUT _IOW(USBTMC_IOC_NR, 10, __u32)
-#define USBTMC_IOCTL_EOM_ENABLE	 _IOW(USBTMC_IOC_NR, 11, __u8)
-#define USBTMC_IOCTL_CONFIG_TERMCHAR \
-	_IOW(USBTMC_IOC_NR, 12, struct usbtmc_termchar)
-#define USBTMC_IOCTL_WRITE	  _IOWR(USBTMC_IOC_NR, 13, struct usbtmc_message)
-#define USBTMC_IOCTL_READ	  _IOWR(USBTMC_IOC_NR, 14, struct usbtmc_message)
-#define USBTMC_IOCTL_WRITE_RESULT _IOWR(USBTMC_IOC_NR, 15, __u32)
-#define USBTMC_IOCTL_API_VERSION  _IOR(USBTMC_IOC_NR, 16, __u32)
+#define USBTMC_IOCTL_CTRL_REQUEST    _IOWR(USBTMC_IOC_NR, 8, struct usbtmc_ctrlrequest)
+#define USBTMC_IOCTL_GET_TIMEOUT     _IOR(USBTMC_IOC_NR, 9, __u32)
+#define USBTMC_IOCTL_SET_TIMEOUT     _IOW(USBTMC_IOC_NR, 10, __u32)
+#define USBTMC_IOCTL_EOM_ENABLE	     _IOW(USBTMC_IOC_NR, 11, __u8)
+#define USBTMC_IOCTL_CONFIG_TERMCHAR _IOW(USBTMC_IOC_NR, 12, struct usbtmc_termchar)
+#define USBTMC_IOCTL_WRITE	     _IOWR(USBTMC_IOC_NR, 13, struct usbtmc_message)
+#define USBTMC_IOCTL_READ	     _IOWR(USBTMC_IOC_NR, 14, struct usbtmc_message)
+#define USBTMC_IOCTL_WRITE_RESULT    _IOWR(USBTMC_IOC_NR, 15, __u32)
+#define USBTMC_IOCTL_API_VERSION     _IOR(USBTMC_IOC_NR, 16, __u32)
 
 #define USBTMC488_IOCTL_GET_CAPS      _IOR(USBTMC_IOC_NR, 17, unsigned char)
 #define USBTMC488_IOCTL_READ_STB      _IOR(USBTMC_IOC_NR, 18, unsigned char)
diff --git a/include/arch/x86_64/linux/usb/video.h b/include/arch/x86_64/linux/usb/video.h
index 678f5a5e..05f4dc96 100644
--- a/include/arch/x86_64/linux/usb/video.h
+++ b/include/arch/x86_64/linux/usb/video.h
@@ -353,8 +353,7 @@ struct uvc_extension_unit_descriptor {
 
 #define UVC_DT_EXTENSION_UNIT_SIZE(p, n) (24 + (p) + (n))
 
-#define UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) \
-	uvc_extension_unit_descriptor_##p_##n
+#define UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) uvc_extension_unit_descriptor_##p_##n
 
 #define DECLARE_UVC_EXTENSION_UNIT_DESCRIPTOR(p, n)  \
 	struct UVC_EXTENSION_UNIT_DESCRIPTOR(p, n) { \