All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] staging: qlge: qlge_main.c: fixed spaces coding style issues
@ 2020-05-29 15:17 ` Jil Rouceau
  0 siblings, 0 replies; 6+ messages in thread
From: Jil Rouceau @ 2020-05-29 15:17 UTC (permalink / raw)
  To: manishc
  Cc: GR-Linux-NIC-Dev, gregkh, netdev, devel, linux-kernel, Jil Rouceau

Fixed the missing spaces before and after binary operators.

Signed-off-by: Jil Rouceau <jilrouceau@gmail.com>
---
 drivers/staging/qlge/qlge_main.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index c92820f07968..36f8d2890f9a 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -702,7 +702,7 @@ static int ql_get_8000_flash_params(struct ql_adapter *qdev)
 
 	size = sizeof(struct flash_params_8000) / sizeof(u32);
 	for (i = 0; i < size; i++, p++) {
-		status = ql_read_flash_word(qdev, i+offset, p);
+		status = ql_read_flash_word(qdev, i + offset, p);
 		if (status) {
 			netif_err(qdev, ifup, qdev->ndev,
 				  "Error reading flash.\n");
@@ -765,7 +765,7 @@ static int ql_get_8012_flash_params(struct ql_adapter *qdev)
 		return -ETIMEDOUT;
 
 	for (i = 0; i < size; i++, p++) {
-		status = ql_read_flash_word(qdev, i+offset, p);
+		status = ql_read_flash_word(qdev, i + offset, p);
 		if (status) {
 			netif_err(qdev, ifup, qdev->ndev,
 				  "Error reading flash.\n");
@@ -1543,7 +1543,7 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev,
 			struct iphdr *iph =
 				(struct iphdr *)((u8 *)addr + hlen);
 			if (!(iph->frag_off &
-				htons(IP_MF|IP_OFFSET))) {
+				htons(IP_MF | IP_OFFSET))) {
 				skb->ip_summed = CHECKSUM_UNNECESSARY;
 				netif_printk(qdev, rx_status, KERN_DEBUG,
 					     qdev->ndev,
@@ -1650,7 +1650,7 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
 			struct iphdr *iph = (struct iphdr *) skb->data;
 
 			if (!(iph->frag_off &
-				htons(IP_MF|IP_OFFSET))) {
+				htons(IP_MF | IP_OFFSET))) {
 				skb->ip_summed = CHECKSUM_UNNECESSARY;
 				netif_printk(qdev, rx_status, KERN_DEBUG,
 					     qdev->ndev,
@@ -1939,7 +1939,7 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
 			struct iphdr *iph = (struct iphdr *) skb->data;
 
 			if (!(iph->frag_off &
-				htons(IP_MF|IP_OFFSET))) {
+				htons(IP_MF | IP_OFFSET))) {
 				skb->ip_summed = CHECKSUM_UNNECESSARY;
 				netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
 					     "TCP checksum done!\n");
@@ -4563,7 +4563,7 @@ static void ql_timer(struct timer_list *t)
 		return;
 	}
 
-	mod_timer(&qdev->timer, jiffies + (5*HZ));
+	mod_timer(&qdev->timer, jiffies + (5 * HZ));
 }
 
 static int qlge_probe(struct pci_dev *pdev,
@@ -4635,7 +4635,7 @@ static int qlge_probe(struct pci_dev *pdev,
 	 * the bus goes dead
 	 */
 	timer_setup(&qdev->timer, ql_timer, TIMER_DEFERRABLE);
-	mod_timer(&qdev->timer, jiffies + (5*HZ));
+	mod_timer(&qdev->timer, jiffies + (5 * HZ));
 	ql_link_off(qdev);
 	ql_display_dev_info(ndev);
 	atomic_set(&qdev->lb_count, 0);
@@ -4769,7 +4769,7 @@ static void qlge_io_resume(struct pci_dev *pdev)
 		netif_err(qdev, ifup, qdev->ndev,
 			  "Device was not running prior to EEH.\n");
 	}
-	mod_timer(&qdev->timer, jiffies + (5*HZ));
+	mod_timer(&qdev->timer, jiffies + (5 * HZ));
 	netif_device_attach(ndev);
 }
 
@@ -4831,7 +4831,7 @@ static int qlge_resume(struct pci_dev *pdev)
 			return err;
 	}
 
-	mod_timer(&qdev->timer, jiffies + (5*HZ));
+	mod_timer(&qdev->timer, jiffies + (5 * HZ));
 	netif_device_attach(ndev);
 
 	return 0;
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] staging: qlge: qlge_main.c: fixed spaces coding style issues
@ 2020-05-29 15:17 ` Jil Rouceau
  0 siblings, 0 replies; 6+ messages in thread
From: Jil Rouceau @ 2020-05-29 15:17 UTC (permalink / raw)
  To: manishc
  Cc: devel, GR-Linux-NIC-Dev, gregkh, linux-kernel, Jil Rouceau, netdev

Fixed the missing spaces before and after binary operators.

Signed-off-by: Jil Rouceau <jilrouceau@gmail.com>
---
 drivers/staging/qlge/qlge_main.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index c92820f07968..36f8d2890f9a 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -702,7 +702,7 @@ static int ql_get_8000_flash_params(struct ql_adapter *qdev)
 
 	size = sizeof(struct flash_params_8000) / sizeof(u32);
 	for (i = 0; i < size; i++, p++) {
-		status = ql_read_flash_word(qdev, i+offset, p);
+		status = ql_read_flash_word(qdev, i + offset, p);
 		if (status) {
 			netif_err(qdev, ifup, qdev->ndev,
 				  "Error reading flash.\n");
@@ -765,7 +765,7 @@ static int ql_get_8012_flash_params(struct ql_adapter *qdev)
 		return -ETIMEDOUT;
 
 	for (i = 0; i < size; i++, p++) {
-		status = ql_read_flash_word(qdev, i+offset, p);
+		status = ql_read_flash_word(qdev, i + offset, p);
 		if (status) {
 			netif_err(qdev, ifup, qdev->ndev,
 				  "Error reading flash.\n");
@@ -1543,7 +1543,7 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev,
 			struct iphdr *iph =
 				(struct iphdr *)((u8 *)addr + hlen);
 			if (!(iph->frag_off &
-				htons(IP_MF|IP_OFFSET))) {
+				htons(IP_MF | IP_OFFSET))) {
 				skb->ip_summed = CHECKSUM_UNNECESSARY;
 				netif_printk(qdev, rx_status, KERN_DEBUG,
 					     qdev->ndev,
@@ -1650,7 +1650,7 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
 			struct iphdr *iph = (struct iphdr *) skb->data;
 
 			if (!(iph->frag_off &
-				htons(IP_MF|IP_OFFSET))) {
+				htons(IP_MF | IP_OFFSET))) {
 				skb->ip_summed = CHECKSUM_UNNECESSARY;
 				netif_printk(qdev, rx_status, KERN_DEBUG,
 					     qdev->ndev,
@@ -1939,7 +1939,7 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
 			struct iphdr *iph = (struct iphdr *) skb->data;
 
 			if (!(iph->frag_off &
-				htons(IP_MF|IP_OFFSET))) {
+				htons(IP_MF | IP_OFFSET))) {
 				skb->ip_summed = CHECKSUM_UNNECESSARY;
 				netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
 					     "TCP checksum done!\n");
@@ -4563,7 +4563,7 @@ static void ql_timer(struct timer_list *t)
 		return;
 	}
 
-	mod_timer(&qdev->timer, jiffies + (5*HZ));
+	mod_timer(&qdev->timer, jiffies + (5 * HZ));
 }
 
 static int qlge_probe(struct pci_dev *pdev,
@@ -4635,7 +4635,7 @@ static int qlge_probe(struct pci_dev *pdev,
 	 * the bus goes dead
 	 */
 	timer_setup(&qdev->timer, ql_timer, TIMER_DEFERRABLE);
-	mod_timer(&qdev->timer, jiffies + (5*HZ));
+	mod_timer(&qdev->timer, jiffies + (5 * HZ));
 	ql_link_off(qdev);
 	ql_display_dev_info(ndev);
 	atomic_set(&qdev->lb_count, 0);
@@ -4769,7 +4769,7 @@ static void qlge_io_resume(struct pci_dev *pdev)
 		netif_err(qdev, ifup, qdev->ndev,
 			  "Device was not running prior to EEH.\n");
 	}
-	mod_timer(&qdev->timer, jiffies + (5*HZ));
+	mod_timer(&qdev->timer, jiffies + (5 * HZ));
 	netif_device_attach(ndev);
 }
 
@@ -4831,7 +4831,7 @@ static int qlge_resume(struct pci_dev *pdev)
 			return err;
 	}
 
-	mod_timer(&qdev->timer, jiffies + (5*HZ));
+	mod_timer(&qdev->timer, jiffies + (5 * HZ));
 	netif_device_attach(ndev);
 
 	return 0;
-- 
2.25.1

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] staging: qlge: qlge_main.c: fixed spaces coding style issues
  2020-05-29 15:17 ` Jil Rouceau
@ 2020-06-01  5:19   ` Benjamin Poirier
  -1 siblings, 0 replies; 6+ messages in thread
From: Benjamin Poirier @ 2020-06-01  5:19 UTC (permalink / raw)
  To: Jil Rouceau
  Cc: manishc, GR-Linux-NIC-Dev, gregkh, netdev, devel, linux-kernel

On 2020-05-29 17:17 +0200, Jil Rouceau wrote:
> Fixed the missing spaces before and after binary operators.
> 
> Signed-off-by: Jil Rouceau <jilrouceau@gmail.com>

This patch does not apply cleanly. I think your base tree is missing
commit ec269f1250c6 ("staging: qlge: Remove unnecessary spaces in
qlge_main.c").

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] staging: qlge: qlge_main.c: fixed spaces coding style issues
@ 2020-06-01  5:19   ` Benjamin Poirier
  0 siblings, 0 replies; 6+ messages in thread
From: Benjamin Poirier @ 2020-06-01  5:19 UTC (permalink / raw)
  To: Jil Rouceau
  Cc: devel, GR-Linux-NIC-Dev, manishc, gregkh, linux-kernel, netdev

On 2020-05-29 17:17 +0200, Jil Rouceau wrote:
> Fixed the missing spaces before and after binary operators.
> 
> Signed-off-by: Jil Rouceau <jilrouceau@gmail.com>

This patch does not apply cleanly. I think your base tree is missing
commit ec269f1250c6 ("staging: qlge: Remove unnecessary spaces in
qlge_main.c").
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] staging: qlge: qlge_main.c: fixed spaces coding style issues
  2020-06-01  5:19   ` Benjamin Poirier
@ 2020-06-01 10:36     ` Jil Rouceau
  -1 siblings, 0 replies; 6+ messages in thread
From: Jil Rouceau @ 2020-06-01 10:36 UTC (permalink / raw)
  To: Benjamin Poirier
  Cc: manishc, GR-Linux-NIC-Dev, gregkh, netdev, devel, linux-kernel

On Mon, 1 Jun 2020 14:19:47 +0900
Benjamin Poirier <benjamin.poirier@gmail.com> wrote:

> On 2020-05-29 17:17 +0200, Jil Rouceau wrote:
> > Fixed the missing spaces before and after binary operators.
> > 
> > Signed-off-by: Jil Rouceau <jilrouceau@gmail.com>  
> 
> This patch does not apply cleanly. I think your base tree is missing
> commit ec269f1250c6 ("staging: qlge: Remove unnecessary spaces in
> qlge_main.c").

Indeed, I was using Linus' tree instead of linux-next, thank you.

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] staging: qlge: qlge_main.c: fixed spaces coding style issues
@ 2020-06-01 10:36     ` Jil Rouceau
  0 siblings, 0 replies; 6+ messages in thread
From: Jil Rouceau @ 2020-06-01 10:36 UTC (permalink / raw)
  To: Benjamin Poirier
  Cc: devel, GR-Linux-NIC-Dev, manishc, gregkh, linux-kernel, netdev

On Mon, 1 Jun 2020 14:19:47 +0900
Benjamin Poirier <benjamin.poirier@gmail.com> wrote:

> On 2020-05-29 17:17 +0200, Jil Rouceau wrote:
> > Fixed the missing spaces before and after binary operators.
> > 
> > Signed-off-by: Jil Rouceau <jilrouceau@gmail.com>  
> 
> This patch does not apply cleanly. I think your base tree is missing
> commit ec269f1250c6 ("staging: qlge: Remove unnecessary spaces in
> qlge_main.c").

Indeed, I was using Linus' tree instead of linux-next, thank you.
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-06-01 10:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-29 15:17 [PATCH] staging: qlge: qlge_main.c: fixed spaces coding style issues Jil Rouceau
2020-05-29 15:17 ` Jil Rouceau
2020-06-01  5:19 ` Benjamin Poirier
2020-06-01  5:19   ` Benjamin Poirier
2020-06-01 10:36   ` Jil Rouceau
2020-06-01 10:36     ` Jil Rouceau

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.