From patchwork Sat Nov 22 07:42:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremiah Mahler X-Patchwork-Id: 413278 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 532A6140158 for ; Sat, 22 Nov 2014 18:43:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751179AbaKVHnP (ORCPT ); Sat, 22 Nov 2014 02:43:15 -0500 Received: from mail-pa0-f43.google.com ([209.85.220.43]:42962 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750762AbaKVHnN (ORCPT ); Sat, 22 Nov 2014 02:43:13 -0500 Received: by mail-pa0-f43.google.com with SMTP id kx10so6412691pab.30 for ; Fri, 21 Nov 2014 23:43:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=M/5n+0C25TjFeMs+NA7qTCG96lS0+Js4pkbC3xkkoZE=; b=ptSw+CYJybAfP47mYENBaBbp/pnzI78xrRBw3W7eN6g/qZ9ZJKgQU5KgbLsioxelq1 IfmRkNhhuxEeQ+cDoKm98NDdYqkeZIqLypfmVN5cozD2yvN5qGU3H9FI44bQPwa3lECQ eEDxDR25uD+NtTDPX3fUr+P+1zAjbG/Pa3FIih2u8VCZyDz9p612OkN/vGjGq1frB8ef TrAGue6pNbUyhas4jgaEPSQv0LICOJFp+1BRj2+Tkn1Fion98YqM2fs5Vi9I2MrObCaa AsYXvCU5FqUP6EWyDcSzNqLusIV/ZdH1jDJZp9a+18V3Mt+fp/BO/+gVIu+wGCJIfCrW iAvA== X-Received: by 10.68.233.67 with SMTP id tu3mr14183794pbc.77.1416642193142; Fri, 21 Nov 2014 23:43:13 -0800 (PST) Received: from localhost (108-76-185-60.lightspeed.frokca.sbcglobal.net. [108.76.185.60]) by mx.google.com with ESMTPSA id ub7sm6648806pbc.30.2014.11.21.23.43.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Nov 2014 23:43:11 -0800 (PST) From: Jeremiah Mahler To: Oliver Hartkopp Cc: "David S. Miller" , linux-can@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jeremiah Mahler Subject: [PATCH] can: eliminate banner[] variable and switch to pr_info() Date: Fri, 21 Nov 2014 23:42:35 -0800 Message-Id: <1416642155-31816-1-git-send-email-jmmahler@gmail.com> X-Mailer: git-send-email 2.1.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Several CAN modules use a design pattern with a banner[] variable at the top which defines a string that is used once during init to print the banner. The string is also embedded with KERN_INFO which makes it printk() specific. Improve the code by eliminating the banner[] variable and moving the string to where it is printed. Then switch from printk(KERN_INFO to pr_info() for the lines that were changed. Signed-off-by: Jeremiah Mahler Acked-by: Oliver Hartkopp --- net/can/af_can.c | 5 +---- net/can/bcm.c | 4 +--- net/can/raw.c | 4 +--- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/net/can/af_can.c b/net/can/af_can.c index ce82337..ac05be1 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -64,9 +64,6 @@ #include "af_can.h" -static __initconst const char banner[] = KERN_INFO - "can: controller area network core (" CAN_VERSION_STRING ")\n"; - MODULE_DESCRIPTION("Controller Area Network PF_CAN core"); MODULE_LICENSE("Dual BSD/GPL"); MODULE_AUTHOR("Urs Thuermann , " @@ -896,7 +893,7 @@ static __init int can_init(void) offsetof(struct can_frame, data) != offsetof(struct canfd_frame, data)); - printk(banner); + pr_info("can: controller area network core (" CAN_VERSION_STRING ")\n"); memset(&can_rx_alldev_list, 0, sizeof(can_rx_alldev_list)); diff --git a/net/can/bcm.c b/net/can/bcm.c index dcb75c0..9aa3f76 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -78,8 +78,6 @@ (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG)) #define CAN_BCM_VERSION CAN_VERSION -static __initconst const char banner[] = KERN_INFO - "can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n"; MODULE_DESCRIPTION("PF_CAN broadcast manager protocol"); MODULE_LICENSE("Dual BSD/GPL"); @@ -1615,7 +1613,7 @@ static int __init bcm_module_init(void) { int err; - printk(banner); + pr_info("can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n"); err = can_proto_register(&bcm_can_proto); if (err < 0) { diff --git a/net/can/raw.c b/net/can/raw.c index 081e81f..e3250e2 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -56,8 +56,6 @@ #include #define CAN_RAW_VERSION CAN_VERSION -static __initconst const char banner[] = - KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n"; MODULE_DESCRIPTION("PF_CAN raw protocol"); MODULE_LICENSE("Dual BSD/GPL"); @@ -810,7 +808,7 @@ static __init int raw_module_init(void) { int err; - printk(banner); + pr_info("can: raw protocol (rev " CAN_RAW_VERSION ")\n"); err = can_proto_register(&raw_can_proto); if (err < 0)