Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b111b78c authored by Jeremiah Mahler's avatar Jeremiah Mahler Committed by Marc Kleine-Budde
Browse files

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: default avatarJeremiah Mahler <jmmahler@gmail.com>
Acked-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 8d0c4697

net/can/af_can.c

+1 −4
Original line number Diff line number Diff line
@@ -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));

net/can/bcm.c

+1 −3
Original line number Diff line number Diff line
@@ -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) {

net/can/raw.c

+1 −3
Original line number Diff line number Diff line
@@ -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)