[PATCH] staging/et131x: fix checkpatch warnings

[PATCH] staging/et131x: fix checkpatch warnings

[Toshiaki Yamane]

The below checkpatch warns was fixed,

drivers/staging/et131x/et131x.c:89: WARNING: quoted string split across lines
drivers/staging/et131x/et131x.c:2557: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
drivers/staging/et131x/et131x.c:2578: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
drivers/staging/et131x/et131x.c:2972: WARNING: suspect code indent for conditional statements (8, 8)
drivers/staging/et131x/et131x.c:4330: WARNING: quoted string split across lines
drivers/staging/et131x/et131x.c:5192: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...

And added pr_fmt.

Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>
---
 drivers/staging/et131x/et131x.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 5b11c5e..1de2425 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -53,6 +53,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -85,8 +87,7 @@
 MODULE_AUTHOR("Victor Soriano <vjsoriano@agere.com>");
 MODULE_AUTHOR("Mark Einon <mark.einon@gmail.com>");
 MODULE_LICENSE("Dual BSD/GPL");
-MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver "
-		   "for the ET1310 by Agere Systems");
+MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver for the ET1310 by Agere Systems");
 
 /* EEPROM defines */
 #define MAX_NUM_REGISTER_POLLS          1000
@@ -2554,8 +2555,8 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 			  "Cannot alloc memory for Packet Status Ring\n");
 		return -ENOMEM;
 	}
-	printk(KERN_INFO "Packet Status Ring %lx\n",
-	    (unsigned long) rx_ring->ps_ring_physaddr);
+	pr_info("Packet Status Ring %lx\n",
+		(unsigned long) rx_ring->ps_ring_physaddr);
 
 	/*
 	 * NOTE : dma_alloc_coherent(), used above to alloc DMA regions,
@@ -2575,7 +2576,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 		return -ENOMEM;
 	}
 	rx_ring->num_rfd = NIC_DEFAULT_NUM_RFD;
-	printk(KERN_INFO "PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
+	pr_info("PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
 
 	/* Recv
 	 * kmem_cache_create initializes a lookaside list. After successful
@@ -2967,11 +2968,10 @@ static struct rfd *nic_rx_pkts(struct et131x_adapter *adapter)
 		(ring_index == 0 &&
 		buff_index > rx_local->fbr[1]->num_entries - 1) ||
 		(ring_index == 1 &&
-		buff_index > rx_local->fbr[0]->num_entries - 1))
+		 buff_index > rx_local->fbr[0]->num_entries - 1)) {
 #else
-	if (ring_index != 1 || buff_index > rx_local->fbr[0]->num_entries - 1)
+	if (ring_index != 1 || buff_index > rx_local->fbr[0]->num_entries - 1) {
 #endif
-	{
 		/* Illegal buffer or ring index cannot be used by S/W*/
 		dev_err(&adapter->pdev->dev,
 			  "NICRxPkts PSR Entry %d indicates "
@@ -4326,8 +4326,8 @@ static int et131x_mii_probe(struct net_device *netdev)
 	phydev->advertising = phydev->supported;
 	adapter->phydev = phydev;
 
-	dev_info(&adapter->pdev->dev, "attached PHY driver [%s] "
-		 "(mii_bus:phy_addr=%s)\n",
+	dev_info(&adapter->pdev->dev,
+		 "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
 		 phydev->drv->name, dev_name(&phydev->dev));
 
 	return 0;
@@ -5189,8 +5189,8 @@ static int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
 
 	memcpy(netdev->dev_addr, address->sa_data, netdev->addr_len);
 
-	printk(KERN_INFO "%s: Setting MAC address to %pM\n",
-			netdev->name, netdev->dev_addr);
+	pr_info("%s: Setting MAC address to %pM\n",
+		netdev->name, netdev->dev_addr);
 
 	/* Free Rx DMA memory */
 	et131x_adapter_memory_free(adapter);
-- 
1.7.5.4

[PATCH] staging/et131x: fix checkpatch warnings

[Toshiaki Yamane]

The below checkpatch warns was fixed,

drivers/staging/et131x/et131x.c:2556: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
drivers/staging/et131x/et131x.c:2577: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
drivers/staging/et131x/et131x.c:5189: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...

And added pr_fmt.

Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>
---
 drivers/staging/et131x/et131x.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index ac6897b..f188453 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -53,6 +53,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -2553,8 +2555,8 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 			  "Cannot alloc memory for Packet Status Ring\n");
 		return -ENOMEM;
 	}
-	printk(KERN_INFO "Packet Status Ring %lx\n",
-	    (unsigned long) rx_ring->ps_ring_physaddr);
+	pr_info("Packet Status Ring %lx\n",
+		(unsigned long) rx_ring->ps_ring_physaddr);
 
 	/*
 	 * NOTE : dma_alloc_coherent(), used above to alloc DMA regions,
@@ -2574,7 +2576,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 		return -ENOMEM;
 	}
 	rx_ring->num_rfd = NIC_DEFAULT_NUM_RFD;
-	printk(KERN_INFO "PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
+	pr_info("PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
 
 	/* Recv
 	 * kmem_cache_create initializes a lookaside list. After successful
@@ -5186,8 +5188,8 @@ static int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
 
 	memcpy(netdev->dev_addr, address->sa_data, netdev->addr_len);
 
-	printk(KERN_INFO "%s: Setting MAC address to %pM\n",
-			netdev->name, netdev->dev_addr);
+	pr_info("%s: Setting MAC address to %pM\n",
+		netdev->name, netdev->dev_addr);
 
 	/* Free Rx DMA memory */
 	et131x_adapter_memory_free(adapter);
-- 
1.7.5.4

Re: [PATCH] staging/et131x: fix checkpatch warnings

[Joe Perches]

On Wed, 2012-07-18 at 10:02 +0900, Toshiaki Yamane wrote:
> Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>

Hello.  Just some trivial notes:

> diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
[]
> @@ -2553,8 +2555,8 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
[]
> -	printk(KERN_INFO "Packet Status Ring %lx\n",
> -	    (unsigned long) rx_ring->ps_ring_physaddr);
> +	pr_info("Packet Status Ring %lx\n",
> +		(unsigned long) rx_ring->ps_ring_physaddr);
> @@ -2574,7 +2576,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
[]
> -	printk(KERN_INFO "PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
> +	pr_info("PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);

These might as well use %p without a cast to unsigned long
	pr_info("Packet Status Ring: %p\n", rx_ring->ps_ring_phydaddr);
[]
	pr_info("PRS: %p\n", rx_ring->rx_status_bus);

[]
> @@ -5186,8 +5188,8 @@ static int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
[]
> -	printk(KERN_INFO "%s: Setting MAC address to %pM\n",
> -			netdev->name, netdev->dev_addr);
> +	pr_info("%s: Setting MAC address to %pM\n",
> +		netdev->name, netdev->dev_addr);

Please use netdev_<level> when there is a
struct net_device * available.

	netdev_info(netdev, "Setting MAC address to %pM\n", netdev->dev_addr);

Re: [PATCH] staging/et131x: fix checkpatch warnings

[Toshiaki Yamane]

Thanks for you reply.

I will fix netdev_info only, because I don't know if I should use "%p".

On Wed, Jul 18, 2012 at 10:16 AM, Joe Perches <joe@perches.com> wrote:
> On Wed, 2012-07-18 at 10:02 +0900, Toshiaki Yamane wrote:
>> Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>
>
> Hello.  Just some trivial notes:
>
>> diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
> []
>> @@ -2553,8 +2555,8 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
> []
>> -     printk(KERN_INFO "Packet Status Ring %lx\n",
>> -         (unsigned long) rx_ring->ps_ring_physaddr);
>> +     pr_info("Packet Status Ring %lx\n",
>> +             (unsigned long) rx_ring->ps_ring_physaddr);
>> @@ -2574,7 +2576,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
> []
>> -     printk(KERN_INFO "PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
>> +     pr_info("PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
>
> These might as well use %p without a cast to unsigned long
>         pr_info("Packet Status Ring: %p\n", rx_ring->ps_ring_phydaddr);
> []
>         pr_info("PRS: %p\n", rx_ring->rx_status_bus);
>
> []
>> @@ -5186,8 +5188,8 @@ static int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
> []
>> -     printk(KERN_INFO "%s: Setting MAC address to %pM\n",
>> -                     netdev->name, netdev->dev_addr);
>> +     pr_info("%s: Setting MAC address to %pM\n",
>> +             netdev->name, netdev->dev_addr);
>
> Please use netdev_<level> when there is a
> struct net_device * available.
>
>         netdev_info(netdev, "Setting MAC address to %pM\n", netdev->dev_addr);
>
>



-- 

Regards,


 .
  .
...

Yamane Toshiaki

yamanetoshi@gmail.com

[PATCH] staging/et131x: fix checkpatch warnings

[Toshiaki Yamane]

The below checkpatch warns was fixed,

drivers/staging/et131x/et131x.c:2556: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
drivers/staging/et131x/et131x.c:2577: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
drivers/staging/et131x/et131x.c:5189: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...

And fixed below,
-converted printk to netdev_info
-added pr_fmt

Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>
---
 drivers/staging/et131x/et131x.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index ac6897b..8ed822f 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -53,6 +53,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -2553,8 +2555,8 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 			  "Cannot alloc memory for Packet Status Ring\n");
 		return -ENOMEM;
 	}
-	printk(KERN_INFO "Packet Status Ring %lx\n",
-	    (unsigned long) rx_ring->ps_ring_physaddr);
+	pr_info("Packet Status Ring %lx\n",
+		(unsigned long) rx_ring->ps_ring_physaddr);
 
 	/*
 	 * NOTE : dma_alloc_coherent(), used above to alloc DMA regions,
@@ -2574,7 +2576,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 		return -ENOMEM;
 	}
 	rx_ring->num_rfd = NIC_DEFAULT_NUM_RFD;
-	printk(KERN_INFO "PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
+	pr_info("PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
 
 	/* Recv
 	 * kmem_cache_create initializes a lookaside list. After successful
@@ -5186,8 +5188,8 @@ static int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
 
 	memcpy(netdev->dev_addr, address->sa_data, netdev->addr_len);
 
-	printk(KERN_INFO "%s: Setting MAC address to %pM\n",
-			netdev->name, netdev->dev_addr);
+	netdev_info(netdev, "Setting MAC address to %pM\n",
+		    netdev->dev_addr);
 
 	/* Free Rx DMA memory */
 	et131x_adapter_memory_free(adapter);
-- 
1.7.5.4

Re: [PATCH] staging/et131x: fix checkpatch warnings

[Joe Perches]

On Wed, 2012-07-18 at 20:32 +0900, Toshiaki Yamane wrote:
> Thanks for you reply.
> 
> I will fix netdev_info only, because I don't know if I should use "%p".

OK, fyi: it turns out ps_ring_physaddr and rx_status_bus
are both dma_addr_t so both should be emitted with %ull
and cast to (unsigned long long) or (u64).

Re: [PATCH] staging/et131x: fix checkpatch warnings

[Toshiaki Yamane]

On Thu, Jul 19, 2012 at 2:53 AM, Joe Perches <joe@perches.com> wrote:
> On Wed, 2012-07-18 at 20:32 +0900, Toshiaki Yamane wrote:
>> Thanks for you reply.
>>
>> I will fix netdev_info only, because I don't know if I should use "%p".
>
> OK, fyi: it turns out ps_ring_physaddr and rx_status_bus
> are both dma_addr_t so both should be emitted with %ull
> and cast to (unsigned long long) or (u64).
>

Thanks for your reply.

%ullx ?

 pr_info("Packet Status Ring: %ullx\n", (unsigned long
long)rx_ring->ps_ring_phydaddr);

Re: [PATCH] staging/et131x: fix checkpatch warnings

[Joe Perches]

On Thu, 2012-07-19 at 09:05 +0900, Toshiaki Yamane wrote:
> On Thu, Jul 19, 2012 at 2:53 AM, Joe Perches <joe@perches.com> wrote:
> > OK, fyi: it turns out ps_ring_physaddr and rx_status_bus
> > are both dma_addr_t so both should be emitted with %ull
> > and cast to (unsigned long long) or (u64).
> Thanks for your reply.
> %ullx ?

My fault, dunno what I was thinking, just %llx 

cheers, Joe

Re: [PATCH] staging/et131x: fix checkpatch warnings

[Toshiaki Yamane]

On Thu, Jul 19, 2012 at 9:10 AM, Joe Perches <joe@perches.com> wrote:
> On Thu, 2012-07-19 at 09:05 +0900, Toshiaki Yamane wrote:
>> On Thu, Jul 19, 2012 at 2:53 AM, Joe Perches <joe@perches.com> wrote:
>> > OK, fyi: it turns out ps_ring_physaddr and rx_status_bus
>> > are both dma_addr_t so both should be emitted with %ull
>> > and cast to (unsigned long long) or (u64).
>> Thanks for your reply.
>> %ullx ?
>
> My fault, dunno what I was thinking, just %llx
>
> cheers, Joe
>

Thanks!
I will try to fix it.

-- 

Regards,


 .
  .
...

Yamane Toshiaki

yamanetoshi@gmail.com

[PATCH] staging/et131x: fix checkpatch warnings

[Toshiaki Yamane]

The below checkpatch warns was fixed,

drivers/staging/et131x/et131x.c:2556: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
drivers/staging/et131x/et131x.c:2577: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
drivers/staging/et131x/et131x.c:5189: WARNING: Prefer pr_info(... to printk(KERN_INFO, ...

And fixed below,
-added pr_fmt
-fixed printk formats for dma_addr_t
-converted printk to netdev_info

Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com>
---
 drivers/staging/et131x/et131x.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index ac6897b..ceaf24f 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -53,6 +53,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -2553,8 +2555,8 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 			  "Cannot alloc memory for Packet Status Ring\n");
 		return -ENOMEM;
 	}
-	printk(KERN_INFO "Packet Status Ring %lx\n",
-	    (unsigned long) rx_ring->ps_ring_physaddr);
+	pr_info("Packet Status Ring %llx\n",
+		(unsigned long long) rx_ring->ps_ring_physaddr);
 
 	/*
 	 * NOTE : dma_alloc_coherent(), used above to alloc DMA regions,
@@ -2574,7 +2576,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
 		return -ENOMEM;
 	}
 	rx_ring->num_rfd = NIC_DEFAULT_NUM_RFD;
-	printk(KERN_INFO "PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
+	pr_info("PRS %llx\n", (unsigned long long)rx_ring->rx_status_bus);
 
 	/* Recv
 	 * kmem_cache_create initializes a lookaside list. After successful
@@ -5186,8 +5188,8 @@ static int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
 
 	memcpy(netdev->dev_addr, address->sa_data, netdev->addr_len);
 
-	printk(KERN_INFO "%s: Setting MAC address to %pM\n",
-			netdev->name, netdev->dev_addr);
+	netdev_info(netdev, "Setting MAC address to %pM\n",
+		    netdev->dev_addr);
 
 	/* Free Rx DMA memory */
 	et131x_adapter_memory_free(adapter);
-- 
1.7.5.4