diff mbox

[net-next,06/10] ixgbe: cleanup some log messages

Message ID 1377686028-30747-7-git-send-email-jeffrey.t.kirsher@intel.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Kirsher, Jeffrey T Aug. 28, 2013, 10:33 a.m. UTC 
From: Don Skidmore <donald.c.skidmore@intel.com>

Some minor log messages cleanup, changing the level one message is logged,
adding a bit of detail to another and put all the text on one line.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 ++----
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c  | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

Comments

Joe Perches Aug. 28, 2013, 2:49 p.m. UTC | #1 
On Wed, 2013-08-28 at 03:33 -0700, Jeff Kirsher wrote:
> From: Don Skidmore <donald.c.skidmore@intel.com>

> Some minor log messages cleanup, changing the level one message is logged,
> adding a bit of detail to another and put all the text on one line.

Not a comment about this patch but:

> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
[]
> @@ -1282,7 +1282,7 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw)
>  				status = 0;
>  			} else {
>  				if (hw->allow_unsupported_sfp == true) {

At some point it might be nice to remove the
remaining bool direct comparisons to true/false

$ git grep -E -n "(==|!=)\s*(true|false)" drivers/net/ethernet/intel
drivers/net/ethernet/intel/e1000e/netdev.c:4871:			    (hw->mac.autoneg == true) &&
drivers/net/ethernet/intel/e1000e/phy.c:2651: *  Assumes semaphore is already acquired.  When page_set==true, assumes
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c:763:	if (hw->phy.reset_disable == false) {
drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c:819:	if (hw->mac.orig_link_settings_stored == false) {
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:954:			    (hw->phy.smart_speed_active == false))
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:1099:	if (hw->phy.reset_disable == false && hw->phy.ops.reset != NULL)
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:1167:	if (hw->mac.orig_link_settings_stored == false) {
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:2371:	if (hw->phy.qsfp_shared_i2c_bus == true) {
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:2397:	if (hw->phy.qsfp_shared_i2c_bus == true) {
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:2424:	if (hw->phy.qsfp_shared_i2c_bus == true) {
drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:2450:	if (hw->phy.qsfp_shared_i2c_bus == true) {
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c:1273:				if (hw->allow_unsupported_sfp == true) {


--
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
Skidmore, Donald C Aug. 28, 2013, 4:19 p.m. UTC | #2 
> -----Original Message-----
> From: Joe Perches [mailto:joe@perches.com]
> Sent: Wednesday, August 28, 2013 7:49 AM
> To: Kirsher, Jeffrey T
> Cc: davem@davemloft.net; Skidmore, Donald C; netdev@vger.kernel.org;
> gospo@redhat.com; sassmann@redhat.com
> Subject: Re: [net-next 06/10] ixgbe: cleanup some log messages
> 
> On Wed, 2013-08-28 at 03:33 -0700, Jeff Kirsher wrote:
> > From: Don Skidmore <donald.c.skidmore@intel.com>
> 
> > Some minor log messages cleanup, changing the level one message is
> > logged, adding a bit of detail to another and put all the text on one line.
> 
> Not a comment about this patch but:
> 
> > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
> > b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
> []
> > @@ -1282,7 +1282,7 @@ s32 ixgbe_identify_qsfp_module_generic(struct
> ixgbe_hw *hw)
> >  				status = 0;
> >  			} else {
> >  				if (hw->allow_unsupported_sfp == true) {
> 
> At some point it might be nice to remove the remaining bool direct
> comparisons to true/false
> 
> $ git grep -E -n "(==|!=)\s*(true|false)" drivers/net/ethernet/intel
> drivers/net/ethernet/intel/e1000e/netdev.c:4871:
> (hw->mac.autoneg == true) &&
> drivers/net/ethernet/intel/e1000e/phy.c:2651: *  Assumes semaphore is
> already acquired.  When page_set==true, assumes
> drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c:763:	if (hw-
> >phy.reset_disable == false) {
> drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c:819:	if (hw-
> >mac.orig_link_settings_stored == false) {
> drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:954:
> (hw->phy.smart_speed_active == false))
> drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:1099:	if (hw-
> >phy.reset_disable == false && hw->phy.ops.reset != NULL)
> drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:1167:	if (hw-
> >mac.orig_link_settings_stored == false) {
> drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:2371:	if (hw-
> >phy.qsfp_shared_i2c_bus == true) {
> drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:2397:	if (hw-
> >phy.qsfp_shared_i2c_bus == true) {
> drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:2424:	if (hw-
> >phy.qsfp_shared_i2c_bus == true) {
> drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c:2450:	if (hw-
> >phy.qsfp_shared_i2c_bus == true) {
> drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c:1273:
> 	if (hw->allow_unsupported_sfp == true) {
> 

Thanks for pointing this out Joe. 

 I'll work on a patch to do that for ixgbe and talk with the e1000e owner about doing it with their driver.

--
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 mbox

Patch

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index cf1b41e..4688057 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7605,10 +7605,8 @@  static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	    hw->mac.type == ixgbe_mac_82598EB) {
 		err = 0;
 	} else if (err == IXGBE_ERR_SFP_NOT_SUPPORTED) {
-		e_dev_err("failed to load because an unsupported SFP+ "
-			  "module type was detected.\n");
-		e_dev_err("Reload the driver after installing a supported "
-			  "module.\n");
+		e_dev_err("failed to load because an unsupported SFP+ or QSFP module type was detected.\n");
+		e_dev_err("Reload the driver after installing a supported module.\n");
 		goto err_sw_init;
 	} else if (err) {
 		e_dev_err("HW Init failed: %d\n", err);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index 6a4a799..033997b 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -1282,7 +1282,7 @@  s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw)
 				status = 0;
 			} else {
 				if (hw->allow_unsupported_sfp == true) {
-					e_warn(hw, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. Intel Corporation is not responsible for any harm caused by using untested modules.\n");
+					e_warn(drv, "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. Intel Corporation is not responsible for any harm caused by using untested modules.\n");
 					status = 0;
 				} else {
 					hw_dbg(hw,