From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gal Pressman Subject: [PATCH net-next 2/6] net: No line break on netdev_WARN* formatting Date: Thu, 4 Jan 2018 16:55:59 +0200 Message-ID: <1515077763-27991-3-git-send-email-galp@mellanox.com> References: <1515077763-27991-1-git-send-email-galp@mellanox.com> Cc: netdev@vger.kernel.org, Tariq Toukan , Saeed Mahameed , Gal Pressman To: "David S. Miller" Return-path: Received: from mail-il-dmz.mellanox.com ([193.47.165.129]:51012 "EHLO mellanox.co.il" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753192AbeADO5I (ORCPT ); Thu, 4 Jan 2018 09:57:08 -0500 In-Reply-To: <1515077763-27991-1-git-send-email-galp@mellanox.com> Sender: netdev-owner@vger.kernel.org List-ID: Remove the unnecessary line break between the netdev name and reg state to the actual message that should be printed. For example, this: [86730.307236] ------------[ cut here ]------------ [86730.313496] netdevice: enp27s0f0 Message from the driver [...] Will be replaced with: [86770.259289] ------------[ cut here ]------------ [86770.265191] netdevice: enp27s0f0: Message from the driver [...] Signed-off-by: Gal Pressman Reviewed-by: Saeed Mahameed --- include/linux/netdevice.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 5ff1ef9..87211c4 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4404,11 +4404,11 @@ do { \ * file/line information and a backtrace. */ #define netdev_WARN(dev, format, args...) \ - WARN(1, "netdevice: %s%s\n" format, netdev_name(dev), \ + WARN(1, "netdevice: %s%s: " format, netdev_name(dev), \ netdev_reg_state(dev), ##args) #define netdev_WARN_ONCE(dev, format, args...) \ - WARN_ONCE(1, "netdevice: %s%s\n" format, netdev_name(dev), \ + WARN_ONCE(1, "netdevice: %s%s: " format, netdev_name(dev), \ netdev_reg_state(dev), ##args) /* netif printk helpers, similar to netdev_printk */ -- 2.7.4