Message ID | 1345715813-20757-5-git-send-email-jeffrey.t.kirsher@intel.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On Thu, 2012-08-23 at 02:56 -0700, Jeff Kirsher wrote: > From: Bruce Allan <bruce.w.allan@intel.com> > > checkpatch warning: Prefer pr_info(... to printk(KERN_INFO, ... [] > diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c [] > @@ -4330,9 +4330,8 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) > u32 ctrl = er32(CTRL); > > /* Link status message must follow this format for user tools */ > - printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", > - adapter->netdev->name, > - adapter->link_speed, > + pr_info("e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", > + adapter->netdev->name, adapter->link_speed, > adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half", > (ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" : > (ctrl & E1000_CTRL_RFCE) ? "Rx" : I think these conversions are not a good idea. When you have a specific message format that must be followed, use printk. pr_<level> may at some point in the near future use #define pr_fmt(fmt) KBUiLD_MODNAME ": " fmt as a global default equivalent. -- 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 Thu, 2012-08-23 at 07:01 -0700, Joe Perches wrote: > On Thu, 2012-08-23 at 02:56 -0700, Jeff Kirsher wrote: > > From: Bruce Allan <bruce.w.allan@intel.com> > > > > checkpatch warning: Prefer pr_info(... to printk(KERN_INFO, ... > [] > > diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c > [] > > @@ -4330,9 +4330,8 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) > > u32 ctrl = er32(CTRL); > > > > /* Link status message must follow this format for user tools */ > > - printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", > > - adapter->netdev->name, > > - adapter->link_speed, > > + pr_info("e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", > > + adapter->netdev->name, adapter->link_speed, > > adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half", > > (ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" : > > (ctrl & E1000_CTRL_RFCE) ? "Rx" : > > I think these conversions are not a good idea. > > When you have a specific message format that must be > followed, use printk. > > pr_<level> may at some point in the near future use > #define pr_fmt(fmt) KBUiLD_MODNAME ": " fmt > as a global default equivalent. Hey Jeff. The comment above this change (and the other) reads /* Link status message must follow this format for user tools */ This file already uses #define pr_fmt(fmt) KBUILD_MODNAME... With this patch, the output form changes to use 2 prefixes. Is that really desired? Probably not. If the comments are old and don't apply any more, they should be removed. -- 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 Fri, 2012-08-24 at 11:02 -0700, Joe Perches wrote: > On Thu, 2012-08-23 at 07:01 -0700, Joe Perches wrote: > > On Thu, 2012-08-23 at 02:56 -0700, Jeff Kirsher wrote: > > > From: Bruce Allan <bruce.w.allan@intel.com> > > > > > > checkpatch warning: Prefer pr_info(... to printk(KERN_INFO, ... > > [] > > > diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c > > [] > > > @@ -4330,9 +4330,8 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) > > > u32 ctrl = er32(CTRL); > > > > > > /* Link status message must follow this format for user tools */ > > > - printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", > > > - adapter->netdev->name, > > > - adapter->link_speed, > > > + pr_info("e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", > > > + adapter->netdev->name, adapter->link_speed, > > > adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half", > > > (ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" : > > > (ctrl & E1000_CTRL_RFCE) ? "Rx" : > > > > I think these conversions are not a good idea. > > > > When you have a specific message format that must be > > followed, use printk. > > > > pr_<level> may at some point in the near future use > > #define pr_fmt(fmt) KBUiLD_MODNAME ": " fmt > > as a global default equivalent. > > Hey Jeff. > > The comment above this change (and the other) reads > > /* Link status message must follow this format for user tools */ > > This file already uses #define pr_fmt(fmt) KBUILD_MODNAME... > With this patch, the output form changes to use 2 prefixes. > > Is that really desired? Probably not. > > If the comments are old and don't apply any more, they > should be removed. > Bruce really should answer this since this is his patch and there was a reason why he made the change. My guess was the current output was providing incorrect or mis-leading information.
On Fri, 2012-08-24 at 14:19 -0700, Jeff Kirsher wrote: > On Fri, 2012-08-24 at 11:02 -0700, Joe Perches wrote: > > On Thu, 2012-08-23 at 07:01 -0700, Joe Perches wrote: > > > On Thu, 2012-08-23 at 02:56 -0700, Jeff Kirsher wrote: > > > > From: Bruce Allan <bruce.w.allan@intel.com> > > > > > > > > checkpatch warning: Prefer pr_info(... to printk(KERN_INFO, ... > > > [] > > > > diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c > > > [] > > > > @@ -4330,9 +4330,8 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) > > > > u32 ctrl = er32(CTRL); > > > > > > > > /* Link status message must follow this format for user tools */ > > > > - printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", > > > > - adapter->netdev->name, > > > > - adapter->link_speed, > > > > + pr_info("e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", > > > > + adapter->netdev->name, adapter->link_speed, > > > > adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half", > > > > (ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" : > > > > (ctrl & E1000_CTRL_RFCE) ? "Rx" : [] > > The comment above this change (and the other) reads > > > > /* Link status message must follow this format for user tools */ > > > > This file already uses #define pr_fmt(fmt) KBUILD_MODNAME... > > With this patch, the output form changes to use 2 prefixes. > > > > Is that really desired? Probably not. > > > > If the comments are old and don't apply any more, they > > should be removed. > > > Bruce really should answer this since this is his patch and there was a > reason why he made the change. My guess was the current output was > providing incorrect or mis-leading information. My guess is he was just shutting up checkpatch and didn't notice the newly doubled prefix. happy weekend... -- 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/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index e4d8041..bc611b4 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c @@ -4330,9 +4330,8 @@ static void e1000_print_link_info(struct e1000_adapter *adapter) u32 ctrl = er32(CTRL); /* Link status message must follow this format for user tools */ - printk(KERN_INFO "e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", - adapter->netdev->name, - adapter->link_speed, + pr_info("e1000e: %s NIC Link is Up %d Mbps %s Duplex, Flow Control: %s\n", + adapter->netdev->name, adapter->link_speed, adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half", (ctrl & E1000_CTRL_TFCE) && (ctrl & E1000_CTRL_RFCE) ? "Rx/Tx" : (ctrl & E1000_CTRL_RFCE) ? "Rx" : @@ -4558,8 +4557,8 @@ static void e1000_watchdog_task(struct work_struct *work) adapter->link_speed = 0; adapter->link_duplex = 0; /* Link status message must follow this format */ - printk(KERN_INFO "e1000e: %s NIC Link is Down\n", - adapter->netdev->name); + pr_info("e1000e: %s NIC Link is Down\n", + adapter->netdev->name); netif_carrier_off(netdev); if (!test_bit(__E1000_DOWN, &adapter->state)) mod_timer(&adapter->phy_info_timer,