can: eliminate banner[] variable and switch to pr_info()

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 <jmmahler@gmail.com>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/net/can/af_can.c b/net/can/af_can.c
index ce82337521f665c5847819402d8a9c167452fb90..ac05be131df7fc43c254d735dbe022f8deaac57d 100644 (file)
--- 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 <urs.thuermann@volkswagen.de>, "
@@ -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 01671187e3fe4a862000f6cd463463f8b4042561..6169aa2e42bc934f2885eaa5b2aea95d64313e6c 100644 (file)
--- 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");
@@ -1612,7 +1610,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 dfdcffbb1070651f9d813bcc0b075de511479c35..00c13ef23661bd92133fff7db45588d3bd83fc62 100644 (file)
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -56,8 +56,6 @@
 #include <net/net_namespace.h>
 
 #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)