| Message ID | 1392868178-7011-2-git-send-email-aaron.f.brown@intel.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2014-02-19 at 19:49 -0800, Aaron Brown wrote: > 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. [] > diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c [] > @@ -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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2014-02-19 at 20:09 -0800, Joe Perches wrote: > On Wed, 2014-02-19 at 19:49 -0800, Aaron Brown wrote: > > 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. > [] > > diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c > [] > > @@ -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. Thanks Joe, guess I'll be making another spin... -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2014-02-19 at 20:51 -0800, Aaron Brown wrote: > On Wed, 2014-02-19 at 20:09 -0800, Joe Perches wrote: > > On Wed, 2014-02-19 at 19:49 -0800, Aaron Brown wrote: > > > 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. > > [] > > > diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c [] > > + 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... Or send another patch after this one because there are 2 %pMAC uses in i40evf_main.c -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2014-02-19 at 20:58 -0800, Joe Perches wrote: > On Wed, 2014-02-19 at 20:51 -0800, Aaron Brown wrote: > > On Wed, 2014-02-19 at 20:09 -0800, Joe Perches wrote: > > > On Wed, 2014-02-19 at 19:49 -0800, Aaron Brown wrote: > > > > 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. > > > [] > > > > diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c > [] > > > + 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... > > 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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c index fe2271e..7419ad9 100644 --- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c +++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c @@ -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);