aboutsummaryrefslogtreecommitdiffstats
path: root/net/can/raw.c
diff options
context:
space:
mode:
authorJeremiah Mahler <jmmahler@gmail.com>2014-11-22 02:42:35 -0500
committerMarc Kleine-Budde <mkl@pengutronix.de>2014-12-07 15:22:01 -0500
commitb111b78c6ea52690a47f16922cb41c78f08dd298 (patch)
treebfaa0f16127661c929069cad687052eb4503b288 /net/can/raw.c
parent8d0c4697534a739725e429ff062dea393d8860d1 (diff)
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>
Diffstat (limited to 'net/can/raw.c')
-rw-r--r--net/can/raw.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/can/raw.c b/net/can/raw.c
index dfdcffbb1070..00c13ef23661 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -56,8 +56,6 @@
56#include <net/net_namespace.h> 56#include <net/net_namespace.h>
57 57
58#define CAN_RAW_VERSION CAN_VERSION 58#define CAN_RAW_VERSION CAN_VERSION
59static __initconst const char banner[] =
60 KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n";
61 59
62MODULE_DESCRIPTION("PF_CAN raw protocol"); 60MODULE_DESCRIPTION("PF_CAN raw protocol");
63MODULE_LICENSE("Dual BSD/GPL"); 61MODULE_LICENSE("Dual BSD/GPL");
@@ -810,7 +808,7 @@ static __init int raw_module_init(void)
810{ 808{
811 int err; 809 int err;
812 810
813 printk(banner); 811 pr_info("can: raw protocol (rev " CAN_RAW_VERSION ")\n");
814 812
815 err = can_proto_register(&raw_can_proto); 813 err = can_proto_register(&raw_can_proto);
816 if (err < 0) 814 if (err < 0)