[PATCH 2/6] Staging: gdm72xx: Add space around that " "

shraddha.6596 at gmail.com shraddha.6596 at gmail.com
Sat Dec 26 21:14:41 UTC 2015


From: Shraddha Barke <shraddha.6596 at gmail.com>

Add missing space around that " " to follow linux kernel coding
style. Warning detected by checkpatch

Signed-off-by: Shraddha Barke <shraddha.6596 at gmail.com>
---
 drivers/staging/gdm72xx/gdm_qos.c   | 12 ++++++------
 drivers/staging/gdm72xx/gdm_sdio.c  |  4 ++--
 drivers/staging/gdm72xx/gdm_usb.c   |  2 +-
 drivers/staging/gdm72xx/gdm_wimax.c | 20 +++++++++-----------
 drivers/staging/gdm72xx/hci.h       |  2 +-
 drivers/staging/gdm72xx/netlink_k.c |  6 +++---
 drivers/staging/gdm72xx/sdio_boot.c |  2 +-
 drivers/staging/gdm72xx/usb_boot.c  | 10 +++++-----
 8 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/gdm72xx/gdm_qos.c b/drivers/staging/gdm72xx/gdm_qos.c
index cad347a..c03204b 100644
--- a/drivers/staging/gdm72xx/gdm_qos.c
+++ b/drivers/staging/gdm72xx/gdm_qos.c
@@ -261,7 +261,7 @@ int gdm_qos_send_hci_pkt(struct sk_buff *skb, struct net_device *dev)
 	struct list_head send_list;
 	int ret = 0;
 
-	tcph = (struct tcphdr *)iph + iph->ihl*4;
+	tcph = (struct tcphdr *)iph + iph->ihl * 4;
 
 	if (ethh->h_proto == cpu_to_be16(ETH_P_IP)) {
 		if (qcb->qos_list_cnt && !qos_free_list.cnt) {
@@ -342,17 +342,17 @@ void gdm_recv_qos_hci_packet(void *nic_ptr, u8 *buf, int size)
 	if (sub_cmd_evt == QOS_REPORT) {
 		spin_lock_irqsave(&qcb->qos_lock, flags);
 		for (i = 0; i < qcb->qos_list_cnt; i++) {
-			sfid = ((buf[(i*5) + 6] << 24) & 0xff000000);
-			sfid += ((buf[(i*5) + 7] << 16) & 0xff0000);
-			sfid += ((buf[(i*5) + 8] << 8) & 0xff00);
-			sfid += (buf[(i*5) + 9]);
+			sfid = ((buf[(i * 5) + 6] << 24) & 0xff000000);
+			sfid += ((buf[(i * 5) + 7] << 16) & 0xff0000);
+			sfid += ((buf[(i * 5) + 8] << 8) & 0xff00);
+			sfid += (buf[(i * 5) + 9]);
 			index = get_csr(qcb, sfid, 0);
 			if (index == -1) {
 				spin_unlock_irqrestore(&qcb->qos_lock, flags);
 				netdev_err(nic->netdev, "QoS ERROR: No SF\n");
 				return;
 			}
-			qcb->csr[index].qos_buf_count = buf[(i*5) + 10];
+			qcb->csr[index].qos_buf_count = buf[(i * 5) + 10];
 		}
 
 		extract_qos_list(nic, &send_list);
diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c
index b0521da..3315f0c 100644
--- a/drivers/staging/gdm72xx/gdm_sdio.c
+++ b/drivers/staging/gdm72xx/gdm_sdio.c
@@ -33,10 +33,10 @@
 #define SDU_TX_BUF_SIZE	2048
 #define TX_BUF_SIZE	2048
 #define TX_CHUNK_SIZE	(2048 - TYPE_A_HEADER_SIZE)
-#define RX_BUF_SIZE	(25*1024)
+#define RX_BUF_SIZE	(25 * 1024)
 
 #define TX_HZ		2000
-#define TX_INTERVAL	(1000000/TX_HZ)
+#define TX_INTERVAL	(1000000 / TX_HZ)
 
 static struct sdio_tx *alloc_tx_struct(struct tx_cxt *tx)
 {
diff --git a/drivers/staging/gdm72xx/gdm_usb.c b/drivers/staging/gdm72xx/gdm_usb.c
index 16e497d..5134e4c 100644
--- a/drivers/staging/gdm72xx/gdm_usb.c
+++ b/drivers/staging/gdm72xx/gdm_usb.c
@@ -29,7 +29,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
 #define TX_BUF_SIZE		2048
 
 #if defined(CONFIG_WIMAX_GDM72XX_WIMAX2)
-#define RX_BUF_SIZE		(128*1024)	/* For packet aggregation */
+#define RX_BUF_SIZE		(128 * 1024)	/* For packet aggregation */
 #else
 #define RX_BUF_SIZE		2048
 #endif
diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c
index b8eea21..e63c3ff 100644
--- a/drivers/staging/gdm72xx/gdm_wimax.c
+++ b/drivers/staging/gdm72xx/gdm_wimax.c
@@ -111,8 +111,8 @@ static void gdm_wimax_event_rcv(struct net_device *dev, u16 type, void *msg,
 	struct nic *nic = netdev_priv(dev);
 
 	u8 *buf = msg;
-	u16 hci_cmd =  (buf[0]<<8) | buf[1];
-	u16 hci_len = (buf[2]<<8) | buf[3];
+	u16 hci_cmd =  (buf[0] << 8) | buf[1];
+	u16 hci_len = (buf[2] << 8) | buf[3];
 
 	netdev_dbg(dev, "H=>D: 0x%04x(%d)\n", hci_cmd, hci_len);
 
@@ -193,8 +193,8 @@ static int gdm_wimax_event_send(struct net_device *dev, char *buf, int size)
 	struct evt_entry *e;
 	unsigned long flags;
 
-	u16 hci_cmd =  ((u8)buf[0]<<8) | (u8)buf[1];
-	u16 hci_len = ((u8)buf[2]<<8) | (u8)buf[3];
+	u16 hci_cmd =  ((u8)buf[0] << 8) | (u8)buf[1];
+	u16 hci_len = ((u8)buf[2] << 8) | (u8)buf[3];
 
 	netdev_dbg(dev, "D=>H: 0x%04x(%d)\n", hci_cmd, hci_len);
 
@@ -328,7 +328,7 @@ static void gdm_wimax_ind_if_updown(struct net_device *dev, int if_up)
 	hci->length = cpu_to_be16(sizeof(up_down));
 	hci->data[0] = up_down;
 
-	gdm_wimax_event_send(dev, (char *)hci, HCI_HEADER_SIZE+sizeof(up_down));
+	gdm_wimax_event_send(dev, (char *)hci, HCI_HEADER_SIZE + sizeof(up_down));
 }
 
 static int gdm_wimax_open(struct net_device *dev)
@@ -508,8 +508,7 @@ static void gdm_wimax_prepare_device(struct net_device *dev)
 	hci->cmd_evt = cpu_to_be16(WIMAX_GET_INFO);
 	hci->data[len++] = TLV_T(T_MAC_ADDRESS);
 	hci->length = cpu_to_be16(len);
-	gdm_wimax_send(nic, hci, HCI_HEADER_SIZE+len);
-
+	gdm_wimax_send(nic, hci, HCI_HEADER_SIZE + len);
 	val = T_CAPABILITY_WIMAX | T_CAPABILITY_MULTI_CS;
 	#if defined(CONFIG_WIMAX_GDM72XX_QOS)
 	val |= T_CAPABILITY_QOS;
@@ -527,8 +526,7 @@ static void gdm_wimax_prepare_device(struct net_device *dev)
 	memcpy(&hci->data[len], &val_be32, TLV_L(T_CAPABILITY));
 	len += TLV_L(T_CAPABILITY);
 	hci->length = cpu_to_be16(len);
-	gdm_wimax_send(nic, hci, HCI_HEADER_SIZE+len);
-
+	gdm_wimax_send(nic, hci, HCI_HEADER_SIZE + len);
 	netdev_info(dev, "GDM WiMax Set CAPABILITY: 0x%08X\n", val);
 }
 
@@ -540,10 +538,10 @@ static int gdm_wimax_hci_get_tlv(u8 *buf, u8 *T, u16 *L, u8 **V)
 	*T = buf[0];
 	if (buf[1] == 0x82) {
 		*L = be16_to_cpu(__U82U16(&buf[2]));
-		next_pos = 1/*type*/+3/*len*/;
+		next_pos = 1/*type*/ + 3/*len*/;
 	} else {
 		*L = buf[1];
-		next_pos = 1/*type*/+1/*len*/;
+		next_pos = 1/*type*/ + 1/*len*/;
 	}
 	*V = &buf[next_pos];
 
diff --git a/drivers/staging/gdm72xx/hci.h b/drivers/staging/gdm72xx/hci.h
index 10a6bfa..5fb38d1 100644
--- a/drivers/staging/gdm72xx/hci.h
+++ b/drivers/staging/gdm72xx/hci.h
@@ -17,7 +17,7 @@
 #define HCI_HEADER_SIZE		4
 #define HCI_VALUE_OFFS		(HCI_HEADER_SIZE)
 #define HCI_MAX_PACKET		2048
-#define HCI_MAX_PARAM		(HCI_MAX_PACKET-HCI_HEADER_SIZE)
+#define HCI_MAX_PARAM		(HCI_MAX_PACKET - HCI_HEADER_SIZE)
 #define HCI_MAX_TLV		32
 
 /* CMD-EVT */
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c
index f3cdaa6..c8504b3 100644
--- a/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@ -29,8 +29,8 @@
 #define ND_NLMSG_SPACE(len)		(nlmsg_total_size(len) + ND_IFINDEX_LEN)
 #define ND_NLMSG_DATA(nlh) \
 	((void *)((char *)nlmsg_data(nlh) + ND_IFINDEX_LEN))
-#define ND_NLMSG_S_LEN(len)		(len+ND_IFINDEX_LEN)
-#define ND_NLMSG_R_LEN(nlh)		(nlh->nlmsg_len-ND_IFINDEX_LEN)
+#define ND_NLMSG_S_LEN(len)		(len + ND_IFINDEX_LEN)
+#define ND_NLMSG_R_LEN(nlh)		(nlh->nlmsg_len - ND_IFINDEX_LEN)
 #define ND_NLMSG_IFIDX(nlh)		nlmsg_data(nlh)
 #define ND_MAX_MSG_LEN			8096
 
@@ -143,7 +143,7 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
 	NETLINK_CB(skb).portid = 0;
 	NETLINK_CB(skb).dst_group = 0;
 
-	ret = netlink_broadcast(sock, skb, 0, group+1, GFP_ATOMIC);
+	ret = netlink_broadcast(sock, skb, 0, group + 1, GFP_ATOMIC);
 
 	if (!ret)
 		return len;
diff --git a/drivers/staging/gdm72xx/sdio_boot.c b/drivers/staging/gdm72xx/sdio_boot.c
index ba94b5f..5e9b38f 100644
--- a/drivers/staging/gdm72xx/sdio_boot.c
+++ b/drivers/staging/gdm72xx/sdio_boot.c
@@ -96,7 +96,7 @@ static int download_image(struct sdio_func *func, const char *img_name)
 		buf[1] = (len >> 8) & 0xff;
 		buf[2] = (len >> 16) & 0xff;
 
-		memcpy(buf+TYPE_A_HEADER_SIZE, firm->data + pos, len);
+		memcpy(buf + TYPE_A_HEADER_SIZE, firm->data + pos, len);
 		ret = sdio_memcpy_toio(func, 0, buf, len + TYPE_A_HEADER_SIZE);
 		if (ret < 0) {
 			dev_err(&func->dev,
diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c
index 39ca34031..c317ab9 100644
--- a/drivers/staging/gdm72xx/usb_boot.c
+++ b/drivers/staging/gdm72xx/usb_boot.c
@@ -292,8 +292,8 @@ static int em_download_image(struct usb_device *usbdev, const char *img_name,
 		return -ENOMEM;
 	}
 
-	strcpy(buf+pad_size, type_string);
-	ret = gdm_wibro_send(usbdev, buf, strlen(type_string)+pad_size);
+	strcpy(buf + pad_size, type_string);
+	ret = gdm_wibro_send(usbdev, buf, strlen(type_string) + pad_size);
 	if (ret < 0)
 		goto out;
 
@@ -310,8 +310,8 @@ static int em_download_image(struct usb_device *usbdev, const char *img_name,
 		else
 			len = img_len; /* the last chunk of data */
 
-		memcpy(buf+pad_size, firm->data + pos, len);
-		ret = gdm_wibro_send(usbdev, buf, len+pad_size);
+		memcpy(buf + pad_size, firm->data + pos, len);
+		ret = gdm_wibro_send(usbdev, buf, len + pad_size);
 
 		if (ret < 0)
 			goto out;
@@ -319,7 +319,7 @@ static int em_download_image(struct usb_device *usbdev, const char *img_name,
 		img_len -= DOWNLOAD_CHUCK;
 		pos += DOWNLOAD_CHUCK;
 
-		ret = em_wait_ack(usbdev, ((len+pad_size) % 512 == 0));
+		ret = em_wait_ack(usbdev, ((len + pad_size) % 512 == 0));
 		if (ret < 0)
 			goto out;
 	}
-- 
2.1.4



More information about the devel mailing list