Skip to contentSkip to conversation

05/14 respun.

PATCH In review Aaron Brown 4 participants 8 messages Feb 20, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover 05/14 respun.

Patch 05/14 of the series was updated to address concerns from Joe Perches. The rest of the series remains the same.

Mitch Williams (1):
05/14 v2 i40evf: fix up strings in init task

 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 36 +++++++++++--------------
 1 file changed, 16 insertions(+), 20 deletions(-)
Signature · 1 line
1.8.5.GIT
#1 lore raw

PATCH v2 5/14 i40evf: fix up strings in init task

From: Mitch Williams <[email protected]>

Make sure errors are reported at the correct log level, quit printing the function name every time, and make the messages more consistent in format.

v2: Removed unnecessary periods and redundant OOM message.

Change-ID I50e443467519ad3850def131d84626c50612c611
---
 drivers/net/ethernet/intel/i40evf/i40evf_main.c | 36 +++++++++++--------------
 1 file changed, 16 insertions(+), 20 deletions(-)
drivers/net/ethernet/intel/i40evf/i40evf_main.c +16 -20
index fe2271e..7419ad9 100644
@@ -1927,14 +1927,14 @@ static void i40evf_init_task(struct work_struct *work)
 		adapter->flags &= ~I40EVF_FLAG_RESET_PENDING;
 		err = i40e_set_mac_type(hw);
 		if (err) {
-			dev_info(&pdev->dev, "%s: set_mac_type failed: %d\n",
-				__func__, err);
+			dev_err(&pdev->dev, "Failed to set MAC type (%d)\n",
+				err);
 		goto err;
 		}
 		err = i40evf_check_reset_complete(hw);
 		if (err) {
-			dev_info(&pdev->dev, "%s: device is still in reset (%d).\n",
-				__func__, err);
+			dev_err(&pdev->dev, "Device is still in reset (%d)\n",
+				err);
 			goto err;
 		}
 		hw->aq.num_arq_entries = I40EVF_AQ_LEN;
@@ -1944,14 +1944,14 @@ static void i40evf_init_task(struct work_struct *work)
 
 		err = i40evf_init_adminq(hw);
 		if (err) {
-			dev_info(&pdev->dev, "%s: init_adminq failed: %d\n",
-				__func__, err);
+			dev_err(&pdev->dev, "Failed to init Admin Queue (%d)\n",
+				err);
 			goto err;
 		}
 		err = i40evf_send_api_ver(adapter);
 		if (err) {
-			dev_info(&pdev->dev, "%s: unable to send to PF (%d)\n",
-				__func__, err);
+			dev_err(&pdev->dev, "Unable to send to PF (%d)\n",
+				err);
 			i40evf_shutdown_adminq(hw);
 			goto err;
 		}
@@ -1965,13 +1965,13 @@ static void i40evf_init_task(struct work_struct *work)
 		/* aq msg sent, awaiting reply */
 		err = i40evf_verify_api_ver(adapter);
 		if (err) {
-			dev_err(&pdev->dev, "Unable to verify API version, error %d\n",
+			dev_err(&pdev->dev, "Unable to verify API version (%d)\n",
 				err);
 			goto err;
 		}
 		err = i40evf_send_vf_config_msg(adapter);
 		if (err) {
-			dev_err(&pdev->dev, "Unable send config request, error %d\n",
+			dev_err(&pdev->dev, "Unable send config request (%d)\n",
 				err);
 			goto err;
 		}
@@ -1985,18 +1985,15 @@ static void i40evf_init_task(struct work_struct *work)
 				(I40E_MAX_VF_VSI *
 				 sizeof(struct i40e_virtchnl_vsi_resource));
 			adapter->vf_res = kzalloc(bufsz, GFP_KERNEL);
-			if (!adapter->vf_res) {
-				dev_err(&pdev->dev, "%s: unable to allocate memory\n",
-					__func__);
+			if (!adapter->vf_res)
 				goto err;
-			}
 		}
 		err = i40evf_get_vf_config(adapter);
 		if (err == I40E_ERR_ADMIN_QUEUE_NO_WORK)
 			goto restart;
 		if (err) {
-			dev_info(&pdev->dev, "%s: unable to get VF config (%d)\n",
-				__func__, err);
+			dev_err(&pdev->dev, "Unable to get VF config (%d)\n",
+				err);
 			goto err_alloc;
 		}
 		adapter->state = __I40EVF_INIT_SW;
@@ -2010,7 +2007,7 @@ static void i40evf_init_task(struct work_struct *work)
 			adapter->vsi_res = &adapter->vf_res->vsi_res[i];
 	}
 	if (!adapter->vsi_res) {
-		dev_info(&pdev->dev, "%s: no LAN VSI found\n", __func__);
+		dev_err(&pdev->dev, "No LAN VSI found\n");
 		goto err_alloc;
 	}
 
@@ -2041,9 +2038,8 @@ static void i40evf_init_task(struct work_struct *work)
 
 	/* The HW MAC address was set and/or determined in sw_init */
 	if (!is_valid_ether_addr(adapter->hw.mac.addr)) {
-		dev_info(&pdev->dev,
-			"Invalid MAC address %pMAC, using random\n",
-			adapter->hw.mac.addr);
+		dev_info(&pdev->dev, "Invalid MAC address %pMAC, using random\n",
+			 adapter->hw.mac.addr);
 		random_ether_addr(adapter->hw.mac.addr);
 	}
 	memcpy(netdev->dev_addr, adapter->hw.mac.addr, netdev->addr_len);
Signature · 1 line
1.8.5.GIT
#2 lore raw

Re: [net-next 05/14 v2] i40evf: fix up strings in init task

Quoted 3 lines · Aaron Brown

Make sure errors are reported at the correct log level, quit printing the function name every time, and make the messages more consistent in format.

[]

drivers/net/ethernet/intel/i40evf/i40evf_main.c

Quoted 1 line
drivers/net/ethernet/intel/i40evf/i40evf_main.c +0 -0

[]

drivers/net/ethernet/intel/i40evf/i40evf_main.c static void i40evf_init_task(struct work_struct *work) · line 2042

Quoted 9 lines
drivers/net/ethernet/intel/i40evf/i40evf_main.c +2 -3
@@ -2041,9 +2038,8 @@ static void i40evf_init_task(struct work_struct *work)
 
 	/* The HW MAC address was set and/or determined in sw_init */
 	if (!is_valid_ether_addr(adapter->hw.mac.addr)) {
-		dev_info(&pdev->dev,
-			"Invalid MAC address %pMAC, using random\n",
-			adapter->hw.mac.addr);
+		dev_info(&pdev->dev, "Invalid MAC address %pMAC, using random\n",
+			 adapter->hw.mac.addr);

The "AC" after %pM is superfluous.

#3 lore raw

Re: [net-next 05/14 v2] i40evf: fix up strings in init task

Quoted 9 lines · Joe Perches
Quoted 3 lines · Aaron Brown

Make sure errors are reported at the correct log level, quit printing the function name every time, and make the messages more consistent in format.

[]

drivers/net/ethernet/intel/i40evf/i40evf_main.c

Quoted 1 line
drivers/net/ethernet/intel/i40evf/i40evf_main.c +0 -0

[]

Quoted 2 lines
drivers/net/ethernet/intel/i40evf/i40evf_main.c +0 -0
@@ -2041,9 +2038,8 @@ static void i40evf_init_task(struct work_struct *work)
 
Quoted 9 lines

drivers/net/ethernet/intel/i40evf/i40evf_main.c static void i40evf_init_task(struct work_struct *work) · line 2042

Quoted 7 lines
drivers/net/ethernet/intel/i40evf/i40evf_main.c +2 -3
 	/* The HW MAC address was set and/or determined in sw_init */
 	if (!is_valid_ether_addr(adapter->hw.mac.addr)) {
-		dev_info(&pdev->dev,
-			"Invalid MAC address %pMAC, using random\n",
-			adapter->hw.mac.addr);
+		dev_info(&pdev->dev, "Invalid MAC address %pMAC, using random\n",
+			 adapter->hw.mac.addr);

The "AC" after %pM is superfluous.

Thanks Joe, guess I'll be making another spin...

#4 lore raw

Re: [net-next 05/14 v2] i40evf: fix up strings in init task

Quoted 7 lines · Aaron Brown
Quoted 6 lines · Joe Perches
Quoted 3 lines · Aaron Brown

Make sure errors are reported at the correct log level, quit printing the function name every time, and make the messages more consistent in format.

[]

drivers/net/ethernet/intel/i40evf/i40evf_main.c

Quoted 1 line
drivers/net/ethernet/intel/i40evf/i40evf_main.c +0 -0

[]

Quoted 4 lines
Quoted 3 lines
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -0
+		dev_info(&pdev->dev, "Invalid MAC address %pMAC, using random\n",

drivers/net/ethernet/intel/i40evf/i40evf_main.c static void i40evf_init_task(struct work_struct *work) · line 2042

Quoted 1 line
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -0
+			 adapter->hw.mac.addr);

The "AC" after %pM is superfluous.

Thanks Joe, guess I'll be making another spin...

Or send another patch after this one because there are 2 %pMAC uses in i40evf_main.c

#5 lore raw

Re: [net-next 05/14 v2] i40evf: fix up strings in init task

Quoted 9 lines · Joe Perches
Quoted 7 lines · Aaron Brown
Quoted 6 lines · Joe Perches
Quoted 3 lines · Aaron Brown

Make sure errors are reported at the correct log level, quit printing the function name every time, and make the messages more consistent in format.

[]

drivers/net/ethernet/intel/i40evf/i40evf_main.c

Quoted 1 line
drivers/net/ethernet/intel/i40evf/i40evf_main.c +0 -0

[]

Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -0
+		dev_info(&pdev->dev, "Invalid MAC address %pMAC, using random\n",

drivers/net/ethernet/intel/i40evf/i40evf_main.c static void i40evf_init_task(struct work_struct *work) · line 2042

Quoted 1 line
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -0
+			 adapter->hw.mac.addr);

The "AC" after %pM is superfluous.

Thanks Joe, guess I'll be making another spin...

Or send another patch after this one because there are 2 %pMAC uses in i40evf_main.c

That works. I'll bug Mitch to look for them when he does a hunt for other OOM messages that he said he'd do and send them up later. So I guess this patch can stand for now.

#6 lore raw

RE: [net-next 05/14 v2] i40evf: fix up strings in init task

Quoted 27 lines

-----Original Message-----
From: Brown, Aaron F
Sent: Wednesday, February 19, 2014 9:16 PM
To: Joe Perches
Cc: [email protected]; Williams, Mitch A; [email protected]; [email protected]; [email protected]; Brandeburg, Jesse
Subject: Re: [net-next 05/14 v2] i40evf: fix up strings in init task

Quoted 4 lines · Joe Perches
Quoted 3 lines · Aaron Brown
Quoted 2 lines · Joe Perches
Quoted 1 line · Aaron Brown

Make sure errors are reported at the correct log level, quit

printing

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

the function name every time, and make the messages more consistent

in

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 1 line

format.

[]

Review

Quoted 1 line
(quoted diff) +0 -0

b/drivers/net/ethernet/intel/i40evf/i40evf_main.c

Quoted 2 lines

[]

Quoted 1 line

Review

Quoted 1 line
(quoted diff) +1 -0
+		dev_info(&pdev->dev, "Invalid MAC address %pMAC, using

random\n",

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

drivers/net/ethernet/intel/i40evf/i40evf_main.c static void i40evf_init_task(struct work_struct *work) · line 2042

Quoted 1 line
drivers/net/ethernet/intel/i40evf/i40evf_main.c +1 -0
+			 adapter->hw.mac.addr);

The "AC" after %pM is superfluous.

Quoted 9 lines
Quoted 4 lines
Quoted 1 line

Thanks Joe, guess I'll be making another spin...

Or send another patch after this one because there are 2 %pMAC uses in i40evf_main.c

That works. I'll bug Mitch to look for them when he does a hunt for other OOM messages that he said he'd do and send them up later. So I guess this patch can stand for now.

Added it to my to-do list. Thanks again, Joe.

-Mitch

maintainer
#7 lore raw
In reply to Aaron Brown

From: Aaron Brown <[email protected]>
Date: Wed, 19 Feb 2014 19:49:37 -0800

Quoted 2 lines

Patch 05/14 of the series was updated to address concerns from Joe Perches. The rest of the series remains the same.

When you update any part of a series, you must repost the entire series.

Thank you.