USB: Fix checker warning and errors

This change fixes checker reported warning and errors messages.

Signed-off-by: Mayank Rana <mrana@codeaurora.org>

9 files changed, 129 insertions, 142 deletions

diff --git a/drivers/usb/gadget/function/f_mbim.c b/drivers/usb/gadget/function/f_mbim.c
index 017a2a9cb6ea..ad66ec0d1492 100644
--- a/drivers/usb/gadget/function/f_mbim.c
+++ b/drivers/usb/gadget/function/f_mbim.c
@@ -168,7 +168,7 @@ static inline struct f_mbim *func_to_mbim(struct usb_function *f)
 #define MBIM_FORMATS_SUPPORTED	USB_CDC_NCM_NTB16_SUPPORTED
 
 static struct usb_cdc_ncm_ntb_parameters mbim_ntb_parameters = {
-	.wLength = sizeof mbim_ntb_parameters,
+	.wLength = sizeof(mbim_ntb_parameters),
 	.bmNtbFormatsSupported = cpu_to_le16(MBIM_FORMATS_SUPPORTED),
 	.dwNtbInMaxSize = cpu_to_le32(MBIM_NTB_DEFAULT_IN_SIZE),
 	.wNdpInDivisor = cpu_to_le16(MBIM_NDP_IN_DIVISOR),
@@ -192,7 +192,7 @@ static struct usb_cdc_ncm_ntb_parameters mbim_ntb_parameters = {
 #define NCM_STATUS_BYTECOUNT		16	/* 8 byte header + data */
 
 static struct usb_interface_assoc_descriptor mbim_iad_desc = {
-	.bLength =		sizeof mbim_iad_desc,
+	.bLength =		sizeof(mbim_iad_desc),
 	.bDescriptorType =	USB_DT_INTERFACE_ASSOCIATION,
 
 	/* .bFirstInterface =	DYNAMIC, */
@@ -205,7 +205,7 @@ static struct usb_interface_assoc_descriptor mbim_iad_desc = {
 
 /* interface descriptor: */
 static struct usb_interface_descriptor mbim_control_intf = {
-	.bLength =		sizeof mbim_control_intf,
+	.bLength =		sizeof(mbim_control_intf),
 	.bDescriptorType =	USB_DT_INTERFACE,
 
 	/* .bInterfaceNumber = DYNAMIC */
@@ -217,7 +217,7 @@ static struct usb_interface_descriptor mbim_control_intf = {
 };
 
 static struct usb_cdc_header_desc mbim_header_desc = {
-	.bLength =		sizeof mbim_header_desc,
+	.bLength =		sizeof(mbim_header_desc),
 	.bDescriptorType =	USB_DT_CS_INTERFACE,
 	.bDescriptorSubType =	USB_CDC_HEADER_TYPE,
 
@@ -233,7 +233,7 @@ static struct usb_cdc_union_desc mbim_union_desc = {
 };
 
 static struct usb_cdc_mbim_desc mbim_desc = {
-	.bLength =		sizeof mbim_desc,
+	.bLength =		sizeof(mbim_desc),
 	.bDescriptorType =	USB_DT_CS_INTERFACE,
 	.bDescriptorSubType =	USB_CDC_MBIM_TYPE,
 
@@ -247,7 +247,7 @@ static struct usb_cdc_mbim_desc mbim_desc = {
 };
 
 static struct usb_cdc_mbim_extended_desc ext_mbb_desc = {
-	.bLength =	sizeof ext_mbb_desc,
+	.bLength =	sizeof(ext_mbb_desc),
 	.bDescriptorType =	USB_DT_CS_INTERFACE,
 	.bDescriptorSubType =	USB_CDC_MBIM_EXTENDED_TYPE,
 
@@ -258,7 +258,7 @@ static struct usb_cdc_mbim_extended_desc ext_mbb_desc = {
 
 /* the default data interface has no endpoints ... */
 static struct usb_interface_descriptor mbim_data_nop_intf = {
-	.bLength =		sizeof mbim_data_nop_intf,
+	.bLength =		sizeof(mbim_data_nop_intf),
 	.bDescriptorType =	USB_DT_INTERFACE,
 
 	/* .bInterfaceNumber = DYNAMIC */
@@ -272,7 +272,7 @@ static struct usb_interface_descriptor mbim_data_nop_intf = {
 
 /* ... but the "real" data interface has two bulk endpoints */
 static struct usb_interface_descriptor mbim_data_intf = {
-	.bLength =		sizeof mbim_data_intf,
+	.bLength =		sizeof(mbim_data_intf),
 	.bDescriptorType =	USB_DT_INTERFACE,
 
 	/* .bInterfaceNumber = DYNAMIC */
@@ -400,7 +400,7 @@ static struct usb_endpoint_descriptor ss_mbim_in_desc = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_IN,
 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-	.wMaxPacketSize =	__constant_cpu_to_le16(1024),
+	.wMaxPacketSize =	cpu_to_le16(1024),
 };
 
 static struct usb_ss_ep_comp_descriptor ss_mbim_in_comp_desc = {
@@ -417,7 +417,7 @@ static struct usb_endpoint_descriptor ss_mbim_out_desc = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_OUT,
 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-	.wMaxPacketSize =	__constant_cpu_to_le16(1024),
+	.wMaxPacketSize =	cpu_to_le16(1024),
 };
 
 static struct usb_ss_ep_comp_descriptor ss_mbim_out_comp_desc = {
@@ -514,9 +514,9 @@ static struct {
 	struct mbim_ext_config_desc_function    function;
 } mbim_ext_config_desc = {
 	.header = {
-		.dwLength = __constant_cpu_to_le32(sizeof mbim_ext_config_desc),
-		.bcdVersion = __constant_cpu_to_le16(0x0100),
-		.wIndex = __constant_cpu_to_le16(4),
+		.dwLength = cpu_to_le32(sizeof(mbim_ext_config_desc)),
+		.bcdVersion = cpu_to_le16(0x0100),
+		.wIndex = cpu_to_le16(4),
 		.bCount = 1,
 	},
 	.function = {
@@ -531,10 +531,9 @@ static inline int mbim_lock(atomic_t *excl)
 {
 	if (atomic_inc_return(excl) == 1) {
 		return 0;
-	} else {
-		atomic_dec(excl);
-		return -EBUSY;
-	}
+
+	atomic_dec(excl);
+	return -EBUSY;
 }
 
 static inline void mbim_unlock(atomic_t *excl)
@@ -572,6 +571,7 @@ static struct usb_request *mbim_alloc_req(struct usb_ep *ep, int buffer_size,
 		size_t extra_buf)
 {
 	struct usb_request *req = usb_ep_alloc_request(ep, GFP_KERNEL);
+
 	if (!req)
 		return NULL;
 
@@ -697,7 +697,7 @@ static void mbim_do_notify(struct f_mbim *mbim)
 		pr_debug("Notification %02x sent\n", event->bNotificationType);
 
 		if (atomic_read(&mbim->not_port.notify_count) <= 0) {
-			pr_debug("notify_response_avaliable: done\n");
+			pr_debug("notify_response_available: done\n");
 			return;
 		}
 
@@ -821,8 +821,6 @@ invalid:
 	usb_ep_set_halt(ep);
 
 	pr_err("dev:%p Failed\n", mbim);
-
-	return;
 }
 
 static void
@@ -874,8 +872,6 @@ fmbim_cmd_complete(struct usb_ep *ep, struct usb_request *req)
 	/* wakeup read thread */
 	pr_debug("Wake up read queue\n");
 	wake_up(&dev->read_wq);
-
-	return;
 }
 
 static int
@@ -896,7 +892,7 @@ mbim_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
 	 */
 
 	if (!atomic_read(&mbim->online)) {
-		pr_warning("usb cable is not connected\n");
+		pr_warn("usb cable is not connected\n");
 		return -ENOTCONN;
 	}
 
@@ -967,8 +963,8 @@ mbim_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
 		if (w_length == 0 || w_value != 0 || w_index != mbim->ctrl_id)
 			break;
 
-		value = w_length > sizeof mbim_ntb_parameters ?
-			sizeof mbim_ntb_parameters : w_length;
+		value = w_length > sizeof(mbim_ntb_parameters) ?
+			sizeof(mbim_ntb_parameters) : w_length;
 		memcpy(req->buf, &mbim_ntb_parameters, value);
 		break;
 
@@ -1056,7 +1052,7 @@ static int mbim_ctrlrequest(struct usb_composite_dev *cdev,
 	u16	w_value = le16_to_cpu(ctrl->wValue);
 	u16	w_length = le16_to_cpu(ctrl->wLength);
 
-	/* only respond to OS desciptors when no configuration selected */
+	/* only respond to OS descriptors when no configuration selected */
 	if (cdev->config || !mbim_ext_config_desc.function.subCompatibleID[0])
 		return value;
 
@@ -1088,6 +1084,7 @@ static int mbim_ctrlrequest(struct usb_composite_dev *cdev,
 	/* respond with data transfer or status phase? */
 	if (value >= 0) {
 		int rc;
+
 		cdev->req->zero = value < w_length;
 		cdev->req->length = value;
 		rc = usb_ep_queue(cdev->gadget->ep0, cdev->req, GFP_ATOMIC);
@@ -1838,7 +1835,7 @@ mbim_write(struct file *fp, const char __user *buf, size_t count, loff_t *pos)
 	}
 
 	if (!count || count > MAX_CTRL_PKT_SIZE) {
-		pr_err("error: ctrl pkt lenght %zu\n", count);
+		pr_err("error: ctrl pkt length %zu\n", count);
 		return -EINVAL;
 	}
 
@@ -2147,4 +2144,3 @@ static void fmbim_cleanup(void)
 
 	_mbim_dev = NULL;
 }
-
diff --git a/drivers/usb/gadget/function/f_qc_ecm.c b/drivers/usb/gadget/function/f_qc_ecm.c
index 847eb953ec61..2399d8ec7a9d 100644
--- a/drivers/usb/gadget/function/f_qc_ecm.c
+++ b/drivers/usb/gadget/function/f_qc_ecm.c
@@ -126,7 +126,7 @@ static inline unsigned ecm_qc_bitrate(struct usb_gadget *g)
 /* interface descriptor: */
 
 static struct usb_interface_descriptor ecm_qc_control_intf = {
-	.bLength =		sizeof ecm_qc_control_intf,
+	.bLength =		sizeof(ecm_qc_control_intf),
 	.bDescriptorType =	USB_DT_INTERFACE,
 
 	/* .bInterfaceNumber = DYNAMIC */
@@ -139,7 +139,7 @@ static struct usb_interface_descriptor ecm_qc_control_intf = {
 };
 
 static struct usb_cdc_header_desc ecm_qc_header_desc = {
-	.bLength =		sizeof ecm_qc_header_desc,
+	.bLength =		sizeof(ecm_qc_header_desc),
 	.bDescriptorType =	USB_DT_CS_INTERFACE,
 	.bDescriptorSubType =	USB_CDC_HEADER_TYPE,
 
@@ -155,7 +155,7 @@ static struct usb_cdc_union_desc ecm_qc_union_desc = {
 };
 
 static struct usb_cdc_ether_desc ecm_qc_desc = {
-	.bLength =		sizeof ecm_qc_desc,
+	.bLength =		sizeof(ecm_qc_desc),
 	.bDescriptorType =	USB_DT_CS_INTERFACE,
 	.bDescriptorSubType =	USB_CDC_ETHERNET_TYPE,
 
@@ -170,7 +170,7 @@ static struct usb_cdc_ether_desc ecm_qc_desc = {
 /* the default data interface has no endpoints ... */
 
 static struct usb_interface_descriptor ecm_qc_data_nop_intf = {
-	.bLength =		sizeof ecm_qc_data_nop_intf,
+	.bLength =		sizeof(ecm_qc_data_nop_intf),
 	.bDescriptorType =	USB_DT_INTERFACE,
 
 	.bInterfaceNumber =	1,
@@ -185,7 +185,7 @@ static struct usb_interface_descriptor ecm_qc_data_nop_intf = {
 /* ... but the "real" data interface has two bulk endpoints */
 
 static struct usb_interface_descriptor ecm_qc_data_intf = {
-	.bLength =		sizeof ecm_qc_data_intf,
+	.bLength =		sizeof(ecm_qc_data_intf),
 	.bDescriptorType =	USB_DT_INTERFACE,
 
 	.bInterfaceNumber =	1,
@@ -310,7 +310,7 @@ static struct usb_endpoint_descriptor ecm_qc_ss_in_desc = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_IN,
 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-	.wMaxPacketSize =	__constant_cpu_to_le16(1024),
+	.wMaxPacketSize =	cpu_to_le16(1024),
 };
 
 static struct usb_ss_ep_comp_descriptor ecm_qc_ss_in_comp_desc = {
@@ -327,8 +327,8 @@ static struct usb_endpoint_descriptor ecm_qc_ss_out_desc = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_OUT,
 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-	.wMaxPacketSize =	__constant_cpu_to_le16(1024),
-};
+	.wMaxPacketSize =	cpu_to_le16(1024),
+}
 
 static struct usb_ss_ep_comp_descriptor ecm_qc_ss_out_comp_desc = {
 	.bLength =		sizeof(ecm_qc_ss_out_comp_desc),
@@ -404,7 +404,7 @@ static void ecm_qc_do_notify(struct f_ecm_qc *ecm)
 			ecm->notify_state = ECM_QC_NOTIFY_NONE;
 		}
 		event->wLength = 0;
-		req->length = sizeof *event;
+		req->length = sizeof(*event);
 
 		DBG(cdev, "notify connect %s\n",
 				ecm->is_open ? "true" : "false");
@@ -417,7 +417,7 @@ static void ecm_qc_do_notify(struct f_ecm_qc *ecm)
 		req->length = ECM_QC_STATUS_BYTECOUNT;
 
 		/* SPEED_CHANGE data is up/down speeds in bits/sec */
-		data = req->buf + sizeof *event;
+		data = req->buf + sizeof(*event);
 		data[0] = cpu_to_le32(ecm_qc_bitrate(cdev->gadget));
 		data[1] = data[0];
 
@@ -568,7 +568,7 @@ static int ecm_qc_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 	/* Control interface has only altsetting 0 */
 	if (intf == ecm->ctrl_id) {
 		if (alt != 0) {
-			pr_warning("fail, alt setting is not 0\n");
+			pr_warn("fail, alt setting is not 0\n");
 			goto fail;
 		}
 
@@ -794,6 +794,7 @@ static void ecm_qc_resume(struct usb_function *f)
 static void ecm_qc_open(struct qc_gether *geth)
 {
 	struct f_ecm_qc		*ecm = func_to_ecm_qc(&geth->func);
+
 	DBG(ecm->port.func.config->cdev, "%s\n", __func__);
 
 	ecm->is_open = true;
@@ -1080,7 +1081,7 @@ ecm_qc_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
 	}
 
 	/* allocate and initialize one new instance */
-	ecm = kzalloc(sizeof *ecm, GFP_KERNEL);
+	ecm = kzalloc(sizeof(*ecm), GFP_KERNEL);
 	if (!ecm)
 		return -ENOMEM;
 	__ecm = ecm;
@@ -1092,14 +1093,14 @@ ecm_qc_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
 	if (ecm->xport == USB_GADGET_XPORT_BAM2BAM_IPA) {
 		gether_qc_get_macs(ipa_params.device_ethaddr,
 				ipa_params.host_ethaddr);
-		snprintf(ecm->ethaddr, sizeof ecm->ethaddr,
+		snprintf(ecm->ethaddr, sizeof(ecm->ethaddr),
 		"%02X%02X%02X%02X%02X%02X",
 		ipa_params.host_ethaddr[0], ipa_params.host_ethaddr[1],
 		ipa_params.host_ethaddr[2], ipa_params.host_ethaddr[3],
 		ipa_params.host_ethaddr[4], ipa_params.host_ethaddr[5]);
 		ipa_params.device_ready_notify = ecm_mdm_ready;
 	} else
-		snprintf(ecm->ethaddr, sizeof ecm->ethaddr,
+		snprintf(ecm->ethaddr, sizeof(ecm->ethaddr),
 		"%02X%02X%02X%02X%02X%02X",
 		ethaddr[0], ethaddr[1], ethaddr[2],
 		ethaddr[3], ethaddr[4], ethaddr[5]);
diff --git a/drivers/usb/gadget/function/f_qc_rndis.c b/drivers/usb/gadget/function/f_qc_rndis.c
index 6a616595f4d4..bc319d4fe16c 100644
--- a/drivers/usb/gadget/function/f_qc_rndis.c
+++ b/drivers/usb/gadget/function/f_qc_rndis.c
@@ -153,7 +153,7 @@ static unsigned int rndis_qc_bitrate(struct usb_gadget *g)
 /* interface descriptor: */
 
 static struct usb_interface_descriptor rndis_qc_control_intf = {
-	.bLength =		sizeof rndis_qc_control_intf,
+	.bLength =		sizeof(rndis_qc_control_intf),
 	.bDescriptorType =	USB_DT_INTERFACE,
 
 	/* .bInterfaceNumber = DYNAMIC */
@@ -166,7 +166,7 @@ static struct usb_interface_descriptor rndis_qc_control_intf = {
 };
 
 static struct usb_cdc_header_desc rndis_qc_header_desc = {
-	.bLength =		sizeof rndis_qc_header_desc,
+	.bLength =		sizeof(rndis_qc_header_desc),
 	.bDescriptorType =	USB_DT_CS_INTERFACE,
 	.bDescriptorSubType =	USB_CDC_HEADER_TYPE,
 
@@ -174,7 +174,7 @@ static struct usb_cdc_header_desc rndis_qc_header_desc = {
 };
 
 static struct usb_cdc_call_mgmt_descriptor rndis_qc_call_mgmt_descriptor = {
-	.bLength =		sizeof rndis_qc_call_mgmt_descriptor,
+	.bLength =		sizeof(rndis_qc_call_mgmt_descriptor),
 	.bDescriptorType =	USB_DT_CS_INTERFACE,
 	.bDescriptorSubType =	USB_CDC_CALL_MANAGEMENT_TYPE,
 
@@ -183,7 +183,7 @@ static struct usb_cdc_call_mgmt_descriptor rndis_qc_call_mgmt_descriptor = {
 };
 
 static struct usb_cdc_acm_descriptor rndis_qc_acm_descriptor = {
-	.bLength =		sizeof rndis_qc_acm_descriptor,
+	.bLength =		sizeof(rndis_qc_acm_descriptor),
 	.bDescriptorType =	USB_DT_CS_INTERFACE,
 	.bDescriptorSubType =	USB_CDC_ACM_TYPE,
 
@@ -201,7 +201,7 @@ static struct usb_cdc_union_desc rndis_qc_union_desc = {
 /* the data interface has two bulk endpoints */
 
 static struct usb_interface_descriptor rndis_qc_data_intf = {
-	.bLength =		sizeof rndis_qc_data_intf,
+	.bLength =		sizeof(rndis_qc_data_intf),
 	.bDescriptorType =	USB_DT_INTERFACE,
 
 	/* .bInterfaceNumber = DYNAMIC */
@@ -215,7 +215,7 @@ static struct usb_interface_descriptor rndis_qc_data_intf = {
 
 static struct usb_interface_assoc_descriptor
 rndis_qc_iad_descriptor = {
-	.bLength =		sizeof rndis_qc_iad_descriptor,
+	.bLength =		sizeof(rndis_qc_iad_descriptor),
 	.bDescriptorType =	USB_DT_INTERFACE_ASSOCIATION,
 	.bFirstInterface =	0, /* XXX, hardcoded */
 	.bInterfaceCount =	2, /* control + data */
@@ -327,7 +327,7 @@ static struct usb_endpoint_descriptor rndis_qc_ss_notify_desc = {
 };
 
 static struct usb_ss_ep_comp_descriptor rndis_qc_ss_intr_comp_desc = {
-	.bLength =		sizeof ss_intr_comp_desc,
+	.bLength =		sizeof(ss_intr_comp_desc),
 	.bDescriptorType =	USB_DT_SS_ENDPOINT_COMP,
 
 	/* the following 3 values can be tweaked if necessary */
@@ -355,7 +355,7 @@ static struct usb_endpoint_descriptor rndis_qc_ss_out_desc = {
 };
 
 static struct usb_ss_ep_comp_descriptor rndis_qc_ss_bulk_comp_desc = {
-	.bLength =		sizeof ss_bulk_comp_desc,
+	.bLength =		sizeof(ss_bulk_comp_desc),
 	.bDescriptorType =	USB_DT_SS_ENDPOINT_COMP,
 
 	/* the following 2 values can be tweaked if necessary */
@@ -409,10 +409,9 @@ static inline int rndis_qc_lock(atomic_t *excl)
 {
 	if (atomic_inc_return(excl) == 1) {
 		return 0;
-	} else {
-		atomic_dec(excl);
-		return -EBUSY;
-	}
+
+	atomic_dec(excl);
+	return -EBUSY;
 }
 
 static inline void rndis_qc_unlock(atomic_t *excl)
@@ -500,10 +499,9 @@ static void rndis_qc_response_complete(struct usb_ep *ep,
 	if (!rndis->port.func.config || !rndis->port.func.config->cdev) {
 		pr_err("%s(): cdev or config is NULL.\n", __func__);
 		return;
-	} else {
-		cdev = rndis->port.func.config->cdev;
 	}
 
+	cdev = rndis->port.func.config->cdev;
 	/* after TX:
 	 *  - USB_CDC_GET_ENCAPSULATED_RESPONSE (ep0/control)
 	 *  - RNDIS_RESPONSE_AVAILABLE (status/irq)
@@ -1194,7 +1192,7 @@ rndis_qc_bind_config_vendor(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
 
 	/* allocate and initialize one new instance */
 	status = -ENOMEM;
-	rndis = kzalloc(sizeof *rndis, GFP_KERNEL);
+	rndis = kzalloc(sizeof(*rndis), GFP_KERNEL);
 	if (!rndis) {
 		pr_err("%s: fail allocate and initialize new instance\n",
 			   __func__);
@@ -1211,11 +1209,10 @@ rndis_qc_bind_config_vendor(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
 			rndis_ipa_params.host_ethaddr,
 			rndis_ipa_params.device_ethaddr);
 		rndis_ipa_supported = true;
-		memcpy(rndis->ethaddr, &rndis_ipa_params.host_ethaddr,
-			ETH_ALEN);
+		ether_addr_copy(rndis->ethaddr, &rndis_ipa_params.host_ethaddr);
 		rndis_ipa_params.device_ready_notify = rndis_net_ready_notify;
 	} else
-		memcpy(rndis->ethaddr, ethaddr, ETH_ALEN);
+		ether_addr_copy(rndis->ethaddr, ethaddr);
 
 	rndis->vendorID = vendorID;
 	rndis->manufacturer = manufacturer;
diff --git a/drivers/usb/gadget/function/f_rmnet.c b/drivers/usb/gadget/function/f_rmnet.c
index efce7c382f2b..d84b55cef666 100644
--- a/drivers/usb/gadget/function/f_rmnet.c
+++ b/drivers/usb/gadget/function/f_rmnet.c
@@ -94,7 +94,7 @@ static struct usb_endpoint_descriptor rmnet_fs_notify_desc = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_IN,
 	.bmAttributes =		USB_ENDPOINT_XFER_INT,
-	.wMaxPacketSize =	__constant_cpu_to_le16(RMNET_MAX_NOTIFY_SIZE),
+	.wMaxPacketSize =	cpu_to_le16(RMNET_MAX_NOTIFY_SIZE),
 	.bInterval =		1 << RMNET_NOTIFY_INTERVAL,
 };
 
@@ -103,7 +103,7 @@ static struct usb_endpoint_descriptor rmnet_fs_in_desc  = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_IN,
 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-	.wMaxPacketSize   = __constant_cpu_to_le16(64),
+	.wMaxPacketSize   =	cpu_to_le16(64),
 };
 
 static struct usb_endpoint_descriptor rmnet_fs_out_desc = {
@@ -111,7 +111,7 @@ static struct usb_endpoint_descriptor rmnet_fs_out_desc = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_OUT,
 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-	.wMaxPacketSize   = __constant_cpu_to_le16(64),
+	.wMaxPacketSize   =	cpu_to_le16(64),
 };
 
 static struct usb_descriptor_header *rmnet_fs_function[] = {
@@ -128,7 +128,7 @@ static struct usb_endpoint_descriptor rmnet_hs_notify_desc  = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_IN,
 	.bmAttributes =		USB_ENDPOINT_XFER_INT,
-	.wMaxPacketSize =	__constant_cpu_to_le16(RMNET_MAX_NOTIFY_SIZE),
+	.wMaxPacketSize =	cpu_to_le16(RMNET_MAX_NOTIFY_SIZE),
 	.bInterval =		RMNET_NOTIFY_INTERVAL + 4,
 };
 
@@ -137,7 +137,7 @@ static struct usb_endpoint_descriptor rmnet_hs_in_desc = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_IN,
 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-	.wMaxPacketSize =	__constant_cpu_to_le16(512),
+	.wMaxPacketSize =	cpu_to_le16(512),
 };
 
 static struct usb_endpoint_descriptor rmnet_hs_out_desc = {
@@ -145,7 +145,7 @@ static struct usb_endpoint_descriptor rmnet_hs_out_desc = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_OUT,
 	.bmAttributes =		USB_ENDPOINT_XFER_BULK,
-	.wMaxPacketSize =	__constant_cpu_to_le16(512),
+	.wMaxPacketSize =	cpu_to_le16(512),
 };
 
 static struct usb_descriptor_header *rmnet_hs_function[] = {
@@ -162,12 +162,12 @@ static struct usb_endpoint_descriptor rmnet_ss_notify_desc  = {
 	.bDescriptorType =	USB_DT_ENDPOINT,
 	.bEndpointAddress =	USB_DIR_IN,
 	.bmAttributes =		USB_ENDPOINT_XFER_INT,
-	.wMaxPacketSize =	__constant_cpu_to_le16(RMNET_MAX_NOTIFY_SIZE),
+	.wMaxPacketSize =	cpu_to_le16(RMNET_MAX_NOTIFY_SIZE),
 	.bInterval =		RMNET_NOTIFY_INTERVAL + 4,
 };
 
 static struct usb_ss_ep_comp_descriptor rmnet_ss_notify_comp_desc = {
-	.bLength =		sizeof rmnet_ss_notify_comp_desc,
+	.bLength =		sizeof(rmnet_ss_notify_comp_desc),
 	.bDescriptorType =	USB_DT_SS_ENDPOINT_COMP,
 
 	/* the following 3 values can be tweaked if necessary */
@@ -185,7 +185,7 @@ static struct usb_endpoint_descriptor rmnet_ss_in_desc = {
 };
 
 static struct usb_ss_ep_comp_descriptor rmnet_ss_in_comp_desc = {
-	.bLength =		sizeof rmnet_ss_in_comp_desc,
+	.bLength =		sizeof(rmnet_ss_in_comp_desc),
 	.bDescriptorType =	USB_DT_SS_ENDPOINT_COMP,
 
 	/* the following 2 values can be tweaked if necessary */
@@ -202,7 +202,7 @@ static struct usb_endpoint_descriptor rmnet_ss_out_desc = {
 };
 
 static struct usb_ss_ep_comp_descriptor rmnet_ss_out_comp_desc = {
-	.bLength =		sizeof rmnet_ss_out_comp_desc,
+	.bLength =		sizeof(rmnet_ss_out_comp_desc),
 	.bDescriptorType =	USB_DT_SS_ENDPOINT_COMP,
 
 	/* the following 2 values can be tweaked if necessary */
@@ -312,12 +312,16 @@ static int rmnet_gport_setup(void)
 	int	i;
 	u8 base;
 
-	pr_debug("%s: bam ports: %u bam2bam ports: %u data hsic ports: %u data hsuart ports: %u"
-		" smd ports: %u ctrl hsic ports: %u ctrl hsuart ports: %u"
-		" nr_rmnet_ports: %u\n",
+	pr_debug("%s: bam ports:%u bam2bam ports:%u data hsic ports:%u\n",
 		__func__, no_data_bam_ports, no_data_bam2bam_ports,
-		no_data_hsic_ports, no_data_hsuart_ports, no_ctrl_smd_ports,
-		no_ctrl_hsic_ports, no_ctrl_hsuart_ports, nr_rmnet_ports);
+		no_data_hsic_ports);
+
+	pr_debug("%s: data hsuart ports:%u smd ports:%u ctrl hsic ports:%u\n",
+		__func__, no_data_hsuart_ports, no_ctrl_smd_ports,
+		no_ctrl_hsic_ports);
+
+	pr_debug("%s: ctrl hsuart ports:%u nr_rmnet_ports:%u\n",
+		__func__, no_ctrl_hsuart_ports, nr_rmnet_ports);
 
 	if (no_data_bam_ports) {
 		ret = gbam_setup(no_data_bam_ports);
@@ -748,10 +752,9 @@ frmnet_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 	if (!dev->port.in->desc || !dev->port.out->desc) {
 		if (config_ep_by_speed(cdev->gadget, f, dev->port.in) ||
 			config_ep_by_speed(cdev->gadget, f, dev->port.out)) {
-				pr_err("%s(): config_ep_by_speed failed.\n",
-								__func__);
-				ret = -EINVAL;
-				goto err_disable_ep;
+			pr_err("%s(): config_ep_by_speed failed.\n", __func__);
+			ret = -EINVAL;
+			goto err_disable_ep;
 		}
 		dev->port.gadget = dev->cdev->gadget;
 	}
@@ -765,8 +768,10 @@ frmnet_set_alt(struct usb_function *f, unsigned intf, unsigned alt)
 
 	atomic_set(&dev->online, 1);
 
-	/* In case notifications were aborted, but there are pending control
-	   packets in the response queue, re-add the notifications */
+	/*
+	 * In case notifications were aborted, but there are pending control
+	 * packets in the response queue, re-add the notifications.
+	 */
 	list_for_each(cpkt, &dev->cpkt_resp_q)
 		frmnet_ctrl_response_available(dev);
 
@@ -1025,7 +1030,7 @@ frmnet_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
 	pr_debug("%s:dev:%p port#%d\n", __func__, dev, dev->port_num);
 
 	if (!atomic_read(&dev->online)) {
-		pr_warning("%s: usb cable is not connected\n", __func__);
+		pr_warn("%s: usb cable is not connected\n", __func__);
 		return -ENOTCONN;
 	}
 
@@ -1046,7 +1051,7 @@ frmnet_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
 		pr_debug("%s: USB_CDC_GET_ENCAPSULATED_RESPONSE\n", __func__);
 		if (w_value) {
 			pr_err("%s: invalid w_value = %04x\n",
-				   __func__ , w_value);
+				   __func__, w_value);
 			goto invalid;
 		} else {
 			unsigned len;
@@ -1054,8 +1059,8 @@ frmnet_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl)
 
 			spin_lock(&dev->lock);
 			if (list_empty(&dev->cpkt_resp_q)) {
-				pr_err("ctrl resp queue empty "
-					" req%02x.%02x v%04x i%04x l%d\n",
+				pr_err("ctrl resp queue empty: ");
+				pr_err("req%02x.%02x v%04x i%04x l%d\n",
 					ctrl->bRequestType, ctrl->bRequest,
 					w_value, w_index, w_length);
 				ret = 0;
@@ -1115,6 +1120,7 @@ static int frmnet_bind(struct usb_configuration *c, struct usb_function *f)
 	struct usb_ep			*ep;
 	struct usb_composite_dev	*cdev = c->cdev;
 	int				ret = -ENODEV;
+
 	pr_debug("%s: start binding\n", __func__);
 	dev->ifc_id = usb_interface_id(c, f);
 	if (dev->ifc_id < 0) {
@@ -1260,6 +1266,7 @@ static int frmnet_bind_config(struct usb_configuration *c, unsigned portno)
 
 	if (rmnet_ports[portno].data_xport == USB_GADGET_XPORT_ETHER) {
 		struct net_device *net = gether_setup_name_default("usb_rmnet");
+
 		if (IS_ERR(net)) {
 			pr_err("%s: gether_setup failed\n", __func__);
 			return PTR_ERR(net);
@@ -1375,10 +1382,8 @@ static int frmnet_init_port(const char *ctrl_name, const char *data_name,
 		__func__, nr_rmnet_ports, ctrl_name, data_name);
 
 	dev = kzalloc(sizeof(struct f_rmnet), GFP_KERNEL);
-	if (!dev) {
-		pr_err("%s: Unable to allocate rmnet device\n", __func__);
+	if (!dev)
 		return -ENOMEM;
-	}
 
 	dev->port_num = nr_rmnet_ports;
 	spin_lock_init(&dev->lock);
diff --git a/drivers/usb/gadget/function/u_bam.c b/drivers/usb/gadget/function/u_bam.c
index aef5f1a0783f..bc3dd69dcb00 100644
--- a/drivers/usb/gadget/function/u_bam.c
+++ b/drivers/usb/gadget/function/u_bam.c
@@ -230,6 +230,7 @@ static int gbam_alloc_requests(struct usb_ep *ep, struct list_head *head,
 {
 	int i;
 	struct usb_request *req;
+
 	pr_debug("%s: ep:%p head:%p num:%d cb:%p", __func__,
 			ep, head, num, cb);
 
@@ -276,14 +277,12 @@ static struct sk_buff *gbam_alloc_skb_from_pool(struct gbam_port *port)
 		pr_debug("%s: allocate skb\n", __func__);
 		skb = alloc_skb(bam_mux_rx_req_size + BAM_MUX_HDR, GFP_ATOMIC);
 
-		if (!skb) {
-			pr_err("%s: alloc skb failed\n", __func__);
+		if (!skb)
 			goto alloc_exit;
-		}
 
 		skb_reserve(skb, BAM_MUX_HDR);
 
-		if ((d->trans == USB_GADGET_XPORT_BAM2BAM_IPA)) {
+		if (d->trans == USB_GADGET_XPORT_BAM2BAM_IPA) {
 
 			gadget = port->port_usb->gadget;
 
@@ -504,7 +503,7 @@ void gbam_data_recv_cb(void *p, struct sk_buff *skb)
 
 	if (d->tx_skb_q.qlen > bam_mux_tx_pkt_drop_thld) {
 		d->tohost_drp_cnt++;
-		if (printk_ratelimit())
+		if (printk_ratelimited())
 			pr_err("%s: tx pkt dropped: tx_drop_cnt:%u\n",
 					__func__, d->tohost_drp_cnt);
 		spin_unlock_irqrestore(&port->port_lock_dl, flags);
@@ -725,10 +724,10 @@ gbam_epout_complete(struct usb_ep *ep, struct usb_request *req)
 		usb_ep_free_request(ep, req);
 		return;
 	default:
-		if (printk_ratelimit())
+		if (printk_ratelimited())
 			pr_err("%s: %s response error %d, %d/%d\n",
 				__func__, ep->name, status,
-				req->actual, req->length);
+				req->ac_tual, req->length);
 		spin_lock(&port->port_lock_ul);
 		gbam_free_skb_to_pool(port, skb);
 		spin_unlock(&port->port_lock_ul);
@@ -745,8 +744,8 @@ gbam_epout_complete(struct usb_ep *ep, struct usb_request *req)
 			list_add_tail(&req->list, &d->rx_idle);
 			spin_unlock(&port->port_lock_ul);
 			return;
-		} else
-			queue_work(gbam_wq, &d->write_tobam_w);
+		}
+		queue_work(gbam_wq, &d->write_tobam_w);
 	}
 
 	/* TODO: Handle flow control gracefully by having
@@ -1039,7 +1038,7 @@ static void gbam_stop(void *param, enum usb_bam_pipe_dir dir)
 
 	if (dir == USB_TO_PEER_PERIPHERAL) {
 		/*
-		 * Only handling BAM2BAM, as there is no equivelant to
+		 * Only handling BAM2BAM, as there is no equivalent to
 		 * gbam_stop_endless_rx() for the SYS2BAM use case
 		 */
 		if (port->data_ch.src_pipe_type == USB_BAM_PIPE_BAM2BAM)
@@ -1477,7 +1476,7 @@ static void gbam2bam_connect_work(struct work_struct *w)
 	}
 
 	gqti_ctrl_update_ipa_pipes(port->port_usb, port->port_num,
-					d->ipa_params.ipa_prod_ep_idx ,
+					d->ipa_params.ipa_prod_ep_idx,
 					d->ipa_params.ipa_cons_ep_idx);
 
 	connect_params.ipa_usb_pipe_hdl = d->ipa_params.prod_clnt_hdl;
@@ -1627,15 +1626,15 @@ static void gbam2bam_resume_work(struct work_struct *w)
 	if (d->trans == USB_GADGET_XPORT_BAM2BAM_IPA) {
 		if (gadget_is_dwc3(gadget) &&
 			msm_dwc3_reset_ep_after_lpm(gadget)) {
-				configure_data_fifo(d->usb_bam_type,
-					d->src_connection_idx,
-					port->port_usb->out, d->src_pipe_type);
-				configure_data_fifo(d->usb_bam_type,
-					d->dst_connection_idx,
-					port->port_usb->in, d->dst_pipe_type);
-				spin_unlock_irqrestore(&port->port_lock, flags);
-				msm_dwc3_reset_dbm_ep(port->port_usb->in);
-				spin_lock_irqsave(&port->port_lock, flags);
+			configure_data_fifo(d->usb_bam_type,
+				d->src_connection_idx,
+				port->port_usb->out, d->src_pipe_type);
+			configure_data_fifo(d->usb_bam_type,
+				d->dst_connection_idx,
+				port->port_usb->in, d->dst_pipe_type);
+			spin_unlock_irqrestore(&port->port_lock, flags);
+			msm_dwc3_reset_dbm_ep(port->port_usb->in);
+			spin_lock_irqsave(&port->port_lock, flags);
 		}
 		usb_bam_resume(d->usb_bam_type, &d->ipa_params);
 	}
@@ -1733,10 +1732,8 @@ static void gbam_port_free(int portno)
 	struct gbam_port *port = bam_ports[portno].port;
 	struct platform_driver *pdrv = &bam_ports[portno].pdrv;
 
-	if (port) {
-		kfree(port);
-		platform_driver_unregister(pdrv);
-	}
+	kfree(port);
+	platform_driver_unregister(pdrv);
 }
 
 static void gbam2bam_port_free(int portno)
diff --git a/drivers/usb/gadget/function/u_bam_data.c b/drivers/usb/gadget/function/u_bam_data.c
index ff32b391a3e9..226af4bf1595 100644
--- a/drivers/usb/gadget/function/u_bam_data.c
+++ b/drivers/usb/gadget/function/u_bam_data.c
@@ -338,9 +338,8 @@ static void bam_data_start_rx(struct bam_data_port *port)
 	struct sk_buff			*skb;
 	unsigned long			flags;
 
-	if (!port->port_usb) {
+	if (!port->port_usb)
 		return;
-	}
 
 	d = &port->data_ch;
 	ep = port->port_usb->out;
@@ -427,8 +426,8 @@ static void bam_data_epout_complete(struct usb_ep *ep, struct usb_request *req)
 			spin_unlock(&port->port_lock);
 			pr_err_ratelimited("usb bam prod is not granted.\n");
 			return;
-		} else
-			queue_work(bam_data_wq, &d->write_tobam_w);
+		}
+		queue_work(bam_data_wq, &d->write_tobam_w);
 	}
 
 	if (bam_mux_rx_fctrl_support &&
@@ -492,9 +491,8 @@ static int bam_data_sys2bam_alloc_req(struct bam_data_port *port, bool in)
 
 	ret = bam_data_alloc_requests(ep, idle, queue_size, ep_complete,
 			GFP_ATOMIC);
-	if (ret) {
+	if (ret)
 		pr_err("%s: allocation failed\n", __func__);
-	}
 
 	return ret;
 }
@@ -1233,10 +1231,8 @@ static int bam2bam_data_port_alloc(int portno)
 	}
 
 	port = kzalloc(sizeof(struct bam_data_port), GFP_KERNEL);
-	if (!port) {
-		pr_err("no memory to allocate port %d\n", portno);
+	if (!port)
 		return -ENOMEM;
-	}
 
 	bam2bam_data_ports[portno] = port;
 	d = &port->data_ch;
@@ -1746,7 +1742,7 @@ static int bam_data_wake_cb(void *param)
 
 	/*
 	 * In Super-Speed mode, remote wakeup is not allowed for suspended
-	 * functions which have been disallowed by the host to issue Funtion
+	 * functions which have been disallowed by the host to issue Function
 	 * Remote Wakeup.
 	 * Note - We deviate here from the USB 3.0 spec and allow
 	 * non-suspended functions to issue remote-wakeup even if they were not
@@ -1810,7 +1806,7 @@ static void bam_data_stop(void *param, enum usb_bam_pipe_dir dir)
 
 	if (dir == USB_TO_PEER_PERIPHERAL) {
 		/*
-		 * Only handling BAM2BAM, as there is no equivelant to
+		 * Only handling BAM2BAM, as there is no equivalent to
 		 * bam_data_stop_endless_rx() for the SYS2BAM use case
 		 */
 		if (port->data_ch.src_pipe_type == USB_BAM_PIPE_BAM2BAM)
diff --git a/drivers/usb/gadget/function/u_ctrl_qti.c b/drivers/usb/gadget/function/u_ctrl_qti.c
index a9a8ab4618e8..7ef56eca20b8 100644
--- a/drivers/usb/gadget/function/u_ctrl_qti.c
+++ b/drivers/usb/gadget/function/u_ctrl_qti.c
@@ -67,10 +67,8 @@ static inline int qti_ctrl_lock(atomic_t *excl)
 {
 	if (atomic_inc_return(excl) == 1) {
 		return 0;
-	} else {
-		atomic_dec(excl);
-		return -EBUSY;
-	}
+	atomic_dec(excl);
+	return -EBUSY;
 }
 
 static inline void qti_ctrl_unlock(atomic_t *excl)
@@ -480,7 +478,6 @@ qti_ctrl_write(struct file *fp, const char __user *buf, size_t count,
 
 	kbuf = kmalloc(count, GFP_KERNEL);
 	if (!kbuf) {
-		pr_err("failed to allocate ctrl pkt\n");
 		qti_ctrl_unlock(&port->write_excl);
 		return -ENOMEM;
 	}
diff --git a/drivers/usb/gadget/function/u_data_ipa.c b/drivers/usb/gadget/function/u_data_ipa.c
index 1be03f83249b..3a5b1e2da2e6 100644
--- a/drivers/usb/gadget/function/u_data_ipa.c
+++ b/drivers/usb/gadget/function/u_data_ipa.c
@@ -772,10 +772,8 @@ static int ipa_data_port_alloc(int portno)
 	}
 
 	port = kzalloc(sizeof(struct ipa_data_ch_info), GFP_KERNEL);
-	if (!port) {
-		pr_err("no memory to allocate port %d\n", portno);
+	if (!port)
 		return -ENOMEM;
-	}
 
 	ipa_data_ports[portno] = port;
 
diff --git a/drivers/usb/gadget/function/u_qc_ether.c b/drivers/usb/gadget/function/u_qc_ether.c
index 118bab4477ce..f933cc13bf9e 100644
--- a/drivers/usb/gadget/function/u_qc_ether.c
+++ b/drivers/usb/gadget/function/u_qc_ether.c
@@ -81,12 +81,12 @@ struct eth_qc_dev {
 #undef INFO
 
 #define xprintk(d, level, fmt, args...) \
-	printk(level "%s: " fmt , (d)->net->name , ## args)
+	printk(level "%s: " fmt, (d)->net->name, ## args)
 
 #ifdef DEBUG
 #undef DEBUG
 #define DBG(dev, fmt, args...) \
-	xprintk(dev , KERN_DEBUG , fmt , ## args)
+	xprintk(dev, KERN_DEBUG, fmt, ## args)
 #else
 #define DBG(dev, fmt, args...) \
 	do { } while (0)
@@ -100,9 +100,9 @@ struct eth_qc_dev {
 #endif /* DEBUG */
 
 #define ERROR(dev, fmt, args...) \
-	xprintk(dev , KERN_ERR , fmt , ## args)
+	xprintk(dev, KERN_ERR, fmt, ## args)
 #define INFO(dev, fmt, args...) \
-	xprintk(dev , KERN_INFO , fmt , ## args)
+	xprintk(dev, KERN_INFO, fmt, ## args)
 
 /*-------------------------------------------------------------------------*/
 
@@ -131,10 +131,10 @@ static void eth_qc_get_drvinfo(struct net_device *net,
 {
 	struct eth_qc_dev	*dev = netdev_priv(net);
 
-	strlcpy(p->driver, "g_qc_ether", sizeof p->driver);
-	strlcpy(p->version, UETH__VERSION, sizeof p->version);
-	strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version);
-	strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info);
+	strlcpy(p->driver, "g_qc_ether", sizeof(p->driver));
+	strlcpy(p->version, UETH__VERSION, sizeof(p->version));
+	strlcpy(p->fw_version, dev->gadget->name, sizeof(p->fw_version));
+	strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof(p->bus_info));
 }
 
 static const struct ethtool_ops qc_ethtool_ops = {
@@ -183,7 +183,7 @@ static int eth_qc_stop(struct net_device *net)
 
 	spin_lock_irqsave(&dev->lock, flags);
 	if (dev->port_usb && link->close)
-			link->close(link);
+		link->close(link);
 	spin_unlock_irqrestore(&dev->lock, flags);
 
 	return 0;
@@ -282,7 +282,7 @@ int gether_qc_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN],
 	struct net_device	*net;
 	int			status;
 
-	net = alloc_etherdev(sizeof *dev);
+	net = alloc_etherdev(sizeof(*dev));
 	if (!net)
 		return -ENOMEM;
 
@@ -301,7 +301,7 @@ int gether_qc_setup_name(struct usb_gadget *g, u8 ethaddr[ETH_ALEN],
 			"using random %s ethernet address\n", "host");
 
 	if (ethaddr)
-		memcpy(ethaddr, dev->host_mac, ETH_ALEN);
+		ether_addr_copy(ethaddr, dev->host_mac);
 
 	net->netdev_ops = &eth_qc_netdev_ops;
 	net->ethtool_ops = &qc_ethtool_ops;