Fix multiple warnings

PATCH Superseded Anchal Jain 3 participants 5 messages Mar 13, 2016 – Mar 21, 2016 Staging

lore

Share & tools

lore

Anchal Jain

author

2016-03-13 11:35 UTC #0 lore raw

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

Anchal Jain

author

2016-03-13 11:35 UTC #1 lore raw

PATCH 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

Anchal Jain

author

2016-03-13 11:38 UTC #2 lore raw

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

In reply to Anchal Jain

Break lines so that they do not exceed 80
characters. Problem found using checkpatch.

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

---
 drivers/staging/wilc1000/linux_mon.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

drivers/staging/wilc1000/linux_mon.c +11 -7

index fd25116..0d79a61 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 contains 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

Julia Lawall

2016-03-13 11:46 UTC #3 lore raw

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

Quoted 49 lines · Anchal Jain

Break lines so that they do not exceed 80
characters. Problem found using checkpatch.

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

---
 drivers/staging/wilc1000/linux_mon.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

drivers/staging/wilc1000/linux_mon.c +9 -6

index fd25116..0d79a61 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 contains 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);

drivers/staging/wilc1000/linux_mon.c static const struct net_device_ops wilc_wfi_netdev_ops = { · line 262

Quoted 6 lines

drivers/staging/wilc1000/linux_mon.c +2 -1

@@ -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)

The lines here are still over 80 characters. checkpatch should have complained.

julia

Quoted 13 lines

drivers/staging/wilc1000/linux_mon.c +0 -0

 {
 	u32 ret = 0;
 	struct WILC_WFI_mon_priv *priv;

Signature · 8 lines

1.9.1

-- 
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/55e6d749e6540164f7e206c1eb7ddc17b30fa292.1457868804.git.anchalj109%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Greg KH

maintainer

2016-03-21 21:30 UTC #4 lore raw

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

In reply to Anchal Jain

Quoted 4 lines · Anchal Jain

Break lines so that they do not exceed 80
characters. Problem found using checkpatch.
Signed-off-by Anchal Jain <[email protected]>

You need to say which driver you are changing in your subject :(