Skip to contentSkip to conversation

Fix multiple warnings

PATCH Superseded Anchal Jain 2 participants 5 messages Mar 13, 2016 – Mar 22, 2016 Staging

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Anchal Jain

author
#0 lore raw

v2 cover Fix multiple warnings

This patchset updates the wilc1000 driver in order to fix several checkpatch issues detected in the source code.

Anchal Jain (2):
staging: wilc1000: Remove camel case in variable names.
staging: drivers: Fix lines over 80 characters

 drivers/staging/wilc1000/linux_mon.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH v2 1/2 staging: wilc1000: Remove camel case in variable names.

Remove a check detect by checkpatch.pl

CHECK: Avoid CamelCase: <srcAdd>

Signed-off-by Anchal Jain <[email protected]>
---
 drivers/staging/wilc1000/linux_mon.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/wilc1000/linux_mon.c +3 -3
index 7d9e5de..fd25116 100644
@@ -24,7 +24,7 @@ struct wilc_wfi_radiotap_cb_hdr {
 
 static struct net_device *wilc_wfi_mon; /* global monitor netdev */
 
-static u8 srcAdd[6];
+static u8 srcadd[6];
 static u8 bssid[6];
 static u8 broadcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 /**

@@ -225,11 +225,11 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb,
 	skb->dev = mon_priv->real_ndev;
 
 	/* Identify if Ethernet or MAC header (data or mgmt) */
-	memcpy(srcAdd, &skb->data[10], 6);
+	memcpy(srcadd, &skb->data[10], 6);
 	memcpy(bssid, &skb->data[16], 6);
 	/* if source address and bssid fields are equal>>Mac header */
 	/*send it to mgmt frames handler */
-	if (!(memcmp(srcAdd, bssid, 6))) {
+	if (!(memcmp(srcadd, bssid, 6))) {
 		ret = mon_mgmt_tx(mon_priv->real_ndev, skb->data, skb->len);
 		if (ret)
 			netdev_err(dev, "fail to mgmt tx\n");
Signature · 1 line
1.9.1
maintainer
#2 lore raw

Re: [Outreachy kernel] [PATCH v2 1/2] staging: wilc1000: Remove camel case in variable names.

Quoted 8 lines · Anchal Jain

Remove a check detect by checkpatch.pl

CHECK: Avoid CamelCase: <srcAdd>

Signed-off-by Anchal Jain <[email protected]>
---
 drivers/staging/wilc1000/linux_mon.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

What changed in v2?

And I'm confused as to what version of what I should apply, please resend the whole series when you have a problem with one of them. Please resend this whole series.

thanks,

greg k-h

author
#3 lore raw

PATCH v2 2/2 staging: drivers: Fix lines over 80 characters

In reply to Anchal Jain
Signed-off-by Anchal Jain <[email protected]>

---
Changes in v2:
- Improve the code

 drivers/staging/wilc1000/linux_mon.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/staging/wilc1000/linux_mon.c +11 -7
index fd25116..242f82f 100644
@@ -59,9 +59,10 @@ void WILC_WFI_monitor_rx(u8 *buff, u32 size)
 
 	/* Get WILC header */
 	memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET);
-
-	/* The packet offset field conain info about what type of managment frame */
-	/* we are dealing with and ack status */
+	/*
+	 * The packet offset field contain info about what type of management
+	 * the frame we are dealing with and ack status
+	 */
 	pkt_offset = GET_PKT_OFFSET(header);
 
 	if (pkt_offset & IS_MANAGMEMENT_CALLBACK) {

@@ -105,7 +106,7 @@ void WILC_WFI_monitor_rx(u8 *buff, u32 size)
 		hdr->hdr.it_version = 0; /* PKTHDR_RADIOTAP_VERSION; */
 		hdr->hdr.it_len = cpu_to_le16(sizeof(struct wilc_wfi_radiotap_hdr));
 		hdr->hdr.it_present = cpu_to_le32
-				(1 << IEEE80211_RADIOTAP_RATE);                   /* | */
+				(1 << IEEE80211_RADIOTAP_RATE); /* | */
 		hdr->rate = 5; /* txrate->bitrate / 5; */
 	}
 

@@ -127,8 +128,10 @@ struct tx_complete_mon_data {
 static void mgmt_tx_complete(void *priv, int status)
 {
 	struct tx_complete_mon_data *pv_data = priv;
-
-	/* incase of fully hosting mode, the freeing will be done in response to the cfg packet */
+	/*
+	 * in case of fully hosting mode, the freeing will be done
+	 * in response to the cfg packet
+	 */
 	kfree(pv_data->buff);
 
 	kfree(pv_data);

@@ -255,7 +258,8 @@ static const struct net_device_ops wilc_wfi_netdev_ops = {
  *  @date	12 JUL 2012
  *  @version	1.0
  */
-struct net_device *WILC_WFI_init_mon_interface(const char *name, struct net_device *real_dev)
+struct net_device *WILC_WFI_init_mon_interface(const char *name,
+					       struct net_device *real_dev)
 {
 	u32 ret = 0;
 	struct WILC_WFI_mon_priv *priv;
Signature · 1 line
1.9.1
maintainer
#4 lore raw

Re: [Outreachy kernel] [PATCH v2 2/2] staging: drivers: Fix lines over 80 characters

Quoted 1 line · Anchal Jain
Signed-off-by Anchal Jain <[email protected]>

I can't take a patch without a changelog entry :(