Skip to contentSkip to conversation

drivers:staging:gdm724x Fill all alignment should match open parentheses

PATCH In review Bogicevic Sasa 2 participants 8 messages Oct 29, 2015 – Oct 30, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 drivers:staging:gdm724x Fill all alignment should match open parentheses

This fixes all errors about alignment with open parentheses as well as one spacing needed around "-" sign since the patch would not be valid if I left it there

---
 drivers/staging/gdm724x/gdm_lte.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/staging/gdm724x/gdm_lte.c +16 -16
index a8d2cff..6b86551 100644
@@ -162,11 +162,11 @@ static int gdm_lte_emulate_arp(struct sk_buff *skb_in, u32 nic_type)
 	skb_reserve(skb_out, NET_IP_ALIGN);
 
 	memcpy(skb_put(skb_out, mac_header_len), mac_header_data,
-		mac_header_len);
+	       mac_header_len);
 	memcpy(skb_put(skb_out, sizeof(struct arphdr)), arp_out,
-		sizeof(struct arphdr));
+	       sizeof(struct arphdr));
 	memcpy(skb_put(skb_out, sizeof(struct arpdata)), arp_data_out,
-		sizeof(struct arpdata));
+	       sizeof(struct arpdata));
 
 	skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto;
 	skb_out->dev = skb_in->dev;
@@ -300,13 +300,13 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in, u32 nic_type)
 		memcpy(&ipv6_out, ipv6_in, sizeof(struct ipv6hdr));
 		memcpy(ipv6_out.saddr.in6_u.u6_addr8, &na.target_address, 16);
 		memcpy(ipv6_out.daddr.in6_u.u6_addr8,
-			ipv6_in->saddr.in6_u.u6_addr8, 16);
+		       ipv6_in->saddr.in6_u.u6_addr8, 16);
 		ipv6_out.payload_len = htons(sizeof(struct icmp6hdr) +
 				sizeof(struct neighbour_advertisement));
 
 		memcpy(icmp_na, &icmp6_out, sizeof(struct icmp6hdr));
 		memcpy(icmp_na + sizeof(struct icmp6hdr), &na,
-			sizeof(struct neighbour_advertisement));
+		       sizeof(struct neighbour_advertisement));
 
 		icmp6_out.icmp6_cksum = icmp6_checksum(&ipv6_out,
 					(u16 *)icmp_na, sizeof(icmp_na));
@@ -326,13 +326,13 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in, u32 nic_type)
 	skb_reserve(skb_out, NET_IP_ALIGN);
 
 	memcpy(skb_put(skb_out, mac_header_len), mac_header_data,
-		mac_header_len);
+	       mac_header_len);
 	memcpy(skb_put(skb_out, sizeof(struct ipv6hdr)), &ipv6_out,
-		sizeof(struct ipv6hdr));
+	       sizeof(struct ipv6hdr));
 	memcpy(skb_put(skb_out, sizeof(struct icmp6hdr)), &icmp6_out,
-		sizeof(struct icmp6hdr));
+	       sizeof(struct icmp6hdr));
 	memcpy(skb_put(skb_out, sizeof(struct neighbour_advertisement)), &na,
-		sizeof(struct neighbour_advertisement));
+	       sizeof(struct neighbour_advertisement));
 
 	skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto;
 	skb_out->dev = skb_in->dev;
@@ -530,7 +530,7 @@ static int gdm_lte_event_send(struct net_device *dev, char *buf, int len)
 }
 
 static void gdm_lte_event_rcv(struct net_device *dev, u16 type,
-				void *msg, int len)
+			      void *msg, int len)
 {
 	struct nic *nic = netdev_priv(dev);
 
@@ -572,7 +572,7 @@ static u8 find_dev_index(u32 nic_type)
 }
 
 static void gdm_lte_netif_rx(struct net_device *dev, char *buf,
-			int len, int flagged_nic_type)
+			     int len, int flagged_nic_type)
 {
 	u32 nic_type;
 	struct nic *nic;
@@ -697,9 +697,9 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len)
 	u8 index;
 
 	hci_len = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev),
-				multi_sdu->len);
+				   multi_sdu->len);
 	num_packet = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev),
-				multi_sdu->num_packet);
+				      multi_sdu->num_packet);
 
 	for (i = 0; i < num_packet; i++) {
 		sdu = (struct sdu *)data;
@@ -724,7 +724,7 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev *phy_dev, char *buf, int len)
 		if (index < MAX_NIC_TYPE) {
 			dev = phy_dev->dev[index];
 			gdm_lte_netif_rx(dev, (char *)sdu->data,
-					(int)(hci_len-12), nic_type);
+					 (int)(hci_len - 12), nic_type);
 		} else {
 			pr_err("rx sdu invalid nic_type :%x\n", nic_type);
 		}
@@ -772,7 +772,7 @@ static int gdm_lte_receive_pkt(struct phy_dev *phy_dev, char *buf, int len)
 		return ret;
 
 	cmd_evt = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev),
-				hci->cmd_evt);
+				   hci->cmd_evt);
 
 	dev = phy_dev->dev[0];
 	if (dev == NULL)
@@ -839,7 +839,7 @@ static struct net_device_ops gdm_netdev_ops = {
 static u8 gdm_lte_macaddr[ETH_ALEN] = {0x00, 0x0a, 0x3b, 0x00, 0x00, 0x00};
 
 static void form_mac_address(u8 *dev_addr, u8 *nic_src, u8 *nic_dest,
-			u8 *mac_address, u8 index)
+			     u8 *mac_address, u8 index)
 {
 	/* Form the dev_addr */
 	if (!mac_address)
Signature · 1 line
2.1.4
#1 lore raw
Quoted 3 lines · Bogicevic Sasa

This fixes all errors about alignment with open parentheses as well as one spacing needed around "-" sign since the patch would not be valid if I left it there

1) That becomes two different type of change.
2) This has already been done by
a4785ef81023 ("staging: gdm724x: properly indent to match open paranthesis") I think you need to refresh your tree against current staging tree.

3) your patch subject says 2/2, the next patch says 3/3 and the one after that is saying 4/4. There is something wrong in the way you are generating the patches. This 2/2 or 3/3 should not be here unless you are sending a series of patch.

regards
sudip

#2 lore raw
Quoted 10 lines · Sudip Mukherjee
Quoted 3 lines · Bogicevic Sasa

This fixes all errors about alignment with open parentheses as well as one spacing needed around "-" sign since the patch would not be valid if I left it there

1) That becomes two different type of change.
2) This has already been done by
a4785ef81023 ("staging: gdm724x: properly indent to match open paranthesis") I think you need to refresh your tree against current staging tree.

Quoted 7 lines

3) your patch subject says 2/2, the next patch says 3/3 and the one after that is saying 4/4. There is something wrong in the way you are generating the patches. This 2/2 or 3/3 should not be here unless you are sending a series of patch.

regards
sudip

Ok 1) When I changed the alignment in one of the lines then checkpatch.pl starts complaining about the spaces in the same line so what do you do in that situation a) just submit anyway or b) fix it I guess a according to your email
2) I'll see what the hell did I do to not notice this
3) I just pull, make a change, commit and do git format-patch master..somebranch. Do I need to create separate branches for all issues?
Thanks!

#3 lore raw
Quoted 16 lines · Bogicevic Sasa
Quoted 15 lines · Sudip Mukherjee
Quoted 3 lines · Bogicevic Sasa

This fixes all errors about alignment with open parentheses as well as one spacing needed around "-" sign since the patch would not be valid if I left it there

1) That becomes two different type of change.
2) This has already been done by
a4785ef81023 ("staging: gdm724x: properly indent to match open paranthesis") I think you need to refresh your tree against current staging tree.

3) your patch subject says 2/2, the next patch says 3/3 and the one after that is saying 4/4. There is something wrong in the way you are generating the patches. This 2/2 or 3/3 should not be here unless you are sending a series of patch.

Quoted 6 lines
Quoted 2 lines

regards
sudip

Ok 1) When I changed the alignment in one of the lines then checkpatch.pl starts complaining about the spaces in the same line so what do you do in that situation a) just submit anyway or b) fix it I guess a according to your email

It depends on how big that change will be. In this case it was ' ' around '-', although if we go by the books, it should not be allowed, but one space related change can be overlooked. I wont have commented if points 2 and 3 were not there.

Quoted 4 lines

2) I'll see what the hell did I do to not notice this
3) I just pull, make a change, commit and do git format-patch master..somebranch. Do I need to create separate branches for all issues?

No, separate branch should not be necessary. I have only one branch for staging related work. Did you use -n option while using git format-patch?

regards
sudip

#4 lore raw
Quoted 34 lines · Sudip Mukherjee
Quoted 16 lines · Bogicevic Sasa
Quoted 15 lines · Sudip Mukherjee
Quoted 3 lines · Bogicevic Sasa

This fixes all errors about alignment with open parentheses as well as one spacing needed around "-" sign since the patch would not be valid if I left it there

1) That becomes two different type of change.
2) This has already been done by
a4785ef81023 ("staging: gdm724x: properly indent to match open paranthesis") I think you need to refresh your tree against current staging tree.

3) your patch subject says 2/2, the next patch says 3/3 and the one after that is saying 4/4. There is something wrong in the way you are generating the patches. This 2/2 or 3/3 should not be here unless you are sending a series of patch.

Quoted 6 lines
Quoted 2 lines

regards
sudip

Ok 1) When I changed the alignment in one of the lines then checkpatch.pl starts complaining about the spaces in the same line so what do you do in that situation a) just submit anyway or b) fix it I guess a according to your email

It depends on how big that change will be. In this case it was ' ' around '-', although if we go by the books, it should not be allowed, but one space related change can be overlooked. I wont have commented if points 2 and 3 were not there.

Quoted 4 lines

2) I'll see what the hell did I do to not notice this
3) I just pull, make a change, commit and do git format-patch master..somebranch. Do I need to create separate branches for all issues?

Quoted 5 lines

No, separate branch should not be necessary. I have only one branch for staging related work. Did you use -n option while using git format-patch?

regards
sudip

Ah so that might be the catch I didnt use the -n option while creating patches. Thanks for your help

#5 lore raw
Quoted 4 lines · Bogicevic Sasa
Quoted 3 lines · Sudip Mukherjee
Quoted 2 lines · Bogicevic Sasa
Quoted 1 line · Sudip Mukherjee

On Thu, Oct 29, 2015 at 09:15:01PM +0100, Bogicevic Sasa wrote:

<snip>

Quoted 3 lines

Ah so that might be the catch I didnt use the -n option while creating patches. Thanks for your help

No, -n is for numbered output. You can try -N
see man git-format-patch for more details.

regards
sudip

#6 lore raw
Quoted 7 lines · Sudip Mukherjee
Quoted 4 lines · Bogicevic Sasa
Quoted 3 lines · Sudip Mukherjee
Quoted 2 lines · Bogicevic Sasa
Quoted 1 line · Sudip Mukherjee

On Thu, Oct 29, 2015 at 09:15:01PM +0100, Bogicevic Sasa wrote:

<snip>

Quoted 1 line
Quoted 7 lines
Quoted 2 lines

Ah so that might be the catch I didnt use the -n option while creating patches. Thanks for your help

No, -n is for numbered output. You can try -N
see man git-format-patch for more details.

regards

Will do thanks. Can you tell me what kernel tree to pull for my start of development work. Untill now I just pulled latest stable is this correct ? git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git

Quoted 1 line

sudip

#7 lore raw
Quoted 14 lines · Bogicevic Sasa
Quoted 13 lines · Sudip Mukherjee
Quoted 4 lines · Bogicevic Sasa
Quoted 3 lines · Sudip Mukherjee
Quoted 2 lines · Bogicevic Sasa
Quoted 1 line · Sudip Mukherjee

On Thu, Oct 29, 2015 at 09:15:01PM +0100, Bogicevic Sasa wrote:

<snip>

Quoted 3 lines

Ah so that might be the catch I didnt use the -n option while creating patches. Thanks for your help

No, -n is for numbered output. You can try -N
see man git-format-patch for more details.

Quoted 6 lines
Quoted 1 line

regards

Will do thanks. Can you tell me what kernel tree to pull for my start of development work. Untill now I just pulled latest stable is this correct ?
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git

No, use staging-testing branch of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

regards
sudip