* [PATCH] can: Update logging style
@ 2011-11-29 18:54 Joe Perches
2011-11-29 20:06 ` Marc Kleine-Budde
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2011-11-29 18:54 UTC (permalink / raw)
To: Oliver Hartkopp, Urs Thuermann
Cc: David S. Miller, linux-can, netdev, linux-kernel
Use pr_fmt, pr_<level> and pr_<level>_ratelimited.
Coalesce format strings.
Signed-off-by: Joe Perches <joe@perches.com>
---
net/can/af_can.c | 31 ++++++++++++++-----------------
net/can/bcm.c | 14 ++++++++------
net/can/gw.c | 6 ++++--
net/can/proc.c | 8 ++++----
net/can/raw.c | 8 +++++---
5 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 0ce2ad0..c4f0da5 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -40,6 +40,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kmod.h>
@@ -62,8 +64,8 @@
#include "af_can.h"
-static __initdata const char banner[] = KERN_INFO
- "can: controller area network core (" CAN_VERSION_STRING ")\n";
+static __initdata const char banner[] =
+ "controller area network core (" CAN_VERSION_STRING ")";
MODULE_DESCRIPTION("Controller Area Network PF_CAN core");
MODULE_LICENSE("Dual BSD/GPL");
@@ -161,8 +163,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
* return -EPROTONOSUPPORT
*/
if (err)
- printk_ratelimited(KERN_ERR "can: request_module "
- "(can-proto-%d) failed.\n", protocol);
+ pr_err_ratelimited("request_module (can-proto-%d) failed\n",
+ protocol);
cp = can_get_proto(protocol);
}
@@ -505,8 +507,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
d = find_dev_rcv_lists(dev);
if (!d) {
- printk(KERN_ERR "BUG: receive list not found for "
- "dev %s, id %03X, mask %03X\n",
+ pr_err("BUG: receive list not found for dev %s, id %03X, mask %03X\n",
DNAME(dev), can_id, mask);
goto out;
}
@@ -532,8 +533,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
*/
if (!next) {
- printk(KERN_ERR "BUG: receive list entry not found for "
- "dev %s, id %03X, mask %03X\n",
+ pr_err("BUG: receive list entry not found for dev %s, id %03X, mask %03X\n",
DNAME(dev), can_id, mask);
r = NULL;
goto out;
@@ -701,8 +701,7 @@ int can_proto_register(const struct can_proto *cp)
int err = 0;
if (proto < 0 || proto >= CAN_NPROTO) {
- printk(KERN_ERR "can: protocol number %d out of range\n",
- proto);
+ pr_err("protocol number %d out of range\n", proto);
return -EINVAL;
}
@@ -713,8 +712,7 @@ int can_proto_register(const struct can_proto *cp)
mutex_lock(&proto_tab_lock);
if (proto_tab[proto]) {
- printk(KERN_ERR "can: protocol %d already registered\n",
- proto);
+ pr_err("protocol %d already registered\n", proto);
err = -EBUSY;
} else
RCU_INIT_POINTER(proto_tab[proto], cp);
@@ -769,8 +767,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
/* create new dev_rcv_lists for this device */
d = kzalloc(sizeof(*d), GFP_KERNEL);
if (!d) {
- printk(KERN_ERR
- "can: allocation of receive list failed\n");
+ pr_err("allocation of receive list failed\n");
return NOTIFY_DONE;
}
BUG_ON(dev->ml_priv);
@@ -790,8 +787,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
dev->ml_priv = NULL;
}
} else
- printk(KERN_ERR "can: notifier: receive list not "
- "found for dev %s\n", dev->name);
+ pr_err("notifier: receive list not found for dev %s\n",
+ dev->name);
spin_unlock(&can_rcvlists_lock);
@@ -824,7 +821,7 @@ static struct notifier_block can_netdev_notifier __read_mostly = {
static __init int can_init(void)
{
- printk(banner);
+ pr_info("%s\n", banner);
memset(&can_rx_alldev_list, 0, sizeof(can_rx_alldev_list));
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 151b773..540c804 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -39,6 +39,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/interrupt.h>
@@ -77,8 +79,8 @@
(CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))
#define CAN_BCM_VERSION CAN_VERSION
-static __initdata const char banner[] = KERN_INFO
- "can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n";
+static __initdata const char banner[] =
+ "broadcast manager protocol (rev " CAN_BCM_VERSION " t)";
MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");
MODULE_LICENSE("Dual BSD/GPL");
@@ -729,8 +731,8 @@ static void bcm_rx_unreg(struct net_device *dev, struct bcm_op *op)
/* mark as removed subscription */
op->rx_reg_dev = NULL;
} else
- printk(KERN_ERR "can-bcm: bcm_rx_unreg: registered device "
- "mismatch %p %p\n", op->rx_reg_dev, dev);
+ pr_err("%s: registered device mismatch %p %p\n",
+ __func__, op->rx_reg_dev, dev);
}
/*
@@ -1606,11 +1608,11 @@ static int __init bcm_module_init(void)
{
int err;
- printk(banner);
+ pr_info("%s\n", banner);
err = can_proto_register(&bcm_can_proto);
if (err < 0) {
- printk(KERN_ERR "can: registration of bcm protocol failed\n");
+ pr_err("registration of bcm protocol failed\n");
return err;
}
diff --git a/net/can/gw.c b/net/can/gw.c
index 3d79b12..e17253f 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -39,6 +39,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/types.h>
@@ -59,7 +61,7 @@
#define CAN_GW_VERSION "20101209"
static __initdata const char banner[] =
- KERN_INFO "can: netlink gateway (rev " CAN_GW_VERSION ")\n";
+ "netlink gateway (rev " CAN_GW_VERSION ")";
MODULE_DESCRIPTION("PF_CAN netlink gateway");
MODULE_LICENSE("Dual BSD/GPL");
@@ -913,7 +915,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
static __init int cgw_module_init(void)
{
- printk(banner);
+ pr_info("%s\n", banner);
cgw_cache = kmem_cache_create("can_gw", sizeof(struct cgw_job),
0, 0, NULL);
diff --git a/net/can/proc.c b/net/can/proc.c
index ba873c3..c3aedf5 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -39,6 +39,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/proc_fs.h>
#include <linux/list.h>
@@ -118,8 +120,7 @@ static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif,
/* see can_stat_update() - this should NEVER happen! */
if (count > (ULONG_MAX / HZ)) {
- printk(KERN_ERR "can: calc_rate: count exceeded! %ld\n",
- count);
+ pr_err("%s: count exceeded! %ld\n", __func__, count);
return 99999999;
}
@@ -475,8 +476,7 @@ void can_init_proc(void)
can_dir = proc_mkdir("can", init_net.proc_net);
if (!can_dir) {
- printk(KERN_INFO "can: failed to create /proc/net/can . "
- "CONFIG_PROC_FS missing?\n");
+ pr_info("failed to create /proc/net/can . CONFIG_PROC_FS missing?\n");
return;
}
diff --git a/net/can/raw.c b/net/can/raw.c
index cde1b4a..2875c55 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -39,6 +39,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/uio.h>
@@ -56,7 +58,7 @@
#define CAN_RAW_VERSION CAN_VERSION
static __initdata const char banner[] =
- KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n";
+ "raw protocol (rev " CAN_RAW_VERSION ")";
MODULE_DESCRIPTION("PF_CAN raw protocol");
MODULE_LICENSE("Dual BSD/GPL");
@@ -783,11 +785,11 @@ static __init int raw_module_init(void)
{
int err;
- printk(banner);
+ pr_info("%s\n", banner);
err = can_proto_register(&raw_can_proto);
if (err < 0)
- printk(KERN_ERR "can: registration of raw protocol failed\n");
+ pr_err("registration of raw protocol failed\n");
return err;
}
--
1.7.6.405.gc1be0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] can: Update logging style
2011-11-29 18:54 [PATCH] can: Update logging style Joe Perches
@ 2011-11-29 20:06 ` Marc Kleine-Budde
2011-11-30 13:43 ` Oliver Hartkopp
0 siblings, 1 reply; 5+ messages in thread
From: Marc Kleine-Budde @ 2011-11-29 20:06 UTC (permalink / raw)
To: Joe Perches
Cc: Oliver Hartkopp, Urs Thuermann, David S. Miller, linux-can,
netdev, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 9011 bytes --]
On 11/29/2011 07:54 PM, Joe Perches wrote:
> Use pr_fmt, pr_<level> and pr_<level>_ratelimited.
> Coalesce format strings.
>
> Signed-off-by: Joe Perches <joe@perches.com>
The banners will probably looking a bit different, but I think nobody is
screen scraping that output :)
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> net/can/af_can.c | 31 ++++++++++++++-----------------
> net/can/bcm.c | 14 ++++++++------
> net/can/gw.c | 6 ++++--
> net/can/proc.c | 8 ++++----
> net/can/raw.c | 8 +++++---
> 5 files changed, 35 insertions(+), 32 deletions(-)
>
> diff --git a/net/can/af_can.c b/net/can/af_can.c
> index 0ce2ad0..c4f0da5 100644
> --- a/net/can/af_can.c
> +++ b/net/can/af_can.c
> @@ -40,6 +40,8 @@
> *
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/kmod.h>
> @@ -62,8 +64,8 @@
>
> #include "af_can.h"
>
> -static __initdata const char banner[] = KERN_INFO
> - "can: controller area network core (" CAN_VERSION_STRING ")\n";
> +static __initdata const char banner[] =
> + "controller area network core (" CAN_VERSION_STRING ")";
>
> MODULE_DESCRIPTION("Controller Area Network PF_CAN core");
> MODULE_LICENSE("Dual BSD/GPL");
> @@ -161,8 +163,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
> * return -EPROTONOSUPPORT
> */
> if (err)
> - printk_ratelimited(KERN_ERR "can: request_module "
> - "(can-proto-%d) failed.\n", protocol);
> + pr_err_ratelimited("request_module (can-proto-%d) failed\n",
> + protocol);
>
> cp = can_get_proto(protocol);
> }
> @@ -505,8 +507,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
>
> d = find_dev_rcv_lists(dev);
> if (!d) {
> - printk(KERN_ERR "BUG: receive list not found for "
> - "dev %s, id %03X, mask %03X\n",
> + pr_err("BUG: receive list not found for dev %s, id %03X, mask %03X\n",
> DNAME(dev), can_id, mask);
> goto out;
> }
> @@ -532,8 +533,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
> */
>
> if (!next) {
> - printk(KERN_ERR "BUG: receive list entry not found for "
> - "dev %s, id %03X, mask %03X\n",
> + pr_err("BUG: receive list entry not found for dev %s, id %03X, mask %03X\n",
> DNAME(dev), can_id, mask);
> r = NULL;
> goto out;
> @@ -701,8 +701,7 @@ int can_proto_register(const struct can_proto *cp)
> int err = 0;
>
> if (proto < 0 || proto >= CAN_NPROTO) {
> - printk(KERN_ERR "can: protocol number %d out of range\n",
> - proto);
> + pr_err("protocol number %d out of range\n", proto);
> return -EINVAL;
> }
>
> @@ -713,8 +712,7 @@ int can_proto_register(const struct can_proto *cp)
> mutex_lock(&proto_tab_lock);
>
> if (proto_tab[proto]) {
> - printk(KERN_ERR "can: protocol %d already registered\n",
> - proto);
> + pr_err("protocol %d already registered\n", proto);
> err = -EBUSY;
> } else
> RCU_INIT_POINTER(proto_tab[proto], cp);
> @@ -769,8 +767,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
> /* create new dev_rcv_lists for this device */
> d = kzalloc(sizeof(*d), GFP_KERNEL);
> if (!d) {
> - printk(KERN_ERR
> - "can: allocation of receive list failed\n");
> + pr_err("allocation of receive list failed\n");
> return NOTIFY_DONE;
> }
> BUG_ON(dev->ml_priv);
> @@ -790,8 +787,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
> dev->ml_priv = NULL;
> }
> } else
> - printk(KERN_ERR "can: notifier: receive list not "
> - "found for dev %s\n", dev->name);
> + pr_err("notifier: receive list not found for dev %s\n",
> + dev->name);
>
> spin_unlock(&can_rcvlists_lock);
>
> @@ -824,7 +821,7 @@ static struct notifier_block can_netdev_notifier __read_mostly = {
>
> static __init int can_init(void)
> {
> - printk(banner);
> + pr_info("%s\n", banner);
>
> memset(&can_rx_alldev_list, 0, sizeof(can_rx_alldev_list));
>
> diff --git a/net/can/bcm.c b/net/can/bcm.c
> index 151b773..540c804 100644
> --- a/net/can/bcm.c
> +++ b/net/can/bcm.c
> @@ -39,6 +39,8 @@
> *
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/interrupt.h>
> @@ -77,8 +79,8 @@
> (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))
>
> #define CAN_BCM_VERSION CAN_VERSION
> -static __initdata const char banner[] = KERN_INFO
> - "can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n";
> +static __initdata const char banner[] =
> + "broadcast manager protocol (rev " CAN_BCM_VERSION " t)";
>
> MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");
> MODULE_LICENSE("Dual BSD/GPL");
> @@ -729,8 +731,8 @@ static void bcm_rx_unreg(struct net_device *dev, struct bcm_op *op)
> /* mark as removed subscription */
> op->rx_reg_dev = NULL;
> } else
> - printk(KERN_ERR "can-bcm: bcm_rx_unreg: registered device "
> - "mismatch %p %p\n", op->rx_reg_dev, dev);
> + pr_err("%s: registered device mismatch %p %p\n",
> + __func__, op->rx_reg_dev, dev);
> }
>
> /*
> @@ -1606,11 +1608,11 @@ static int __init bcm_module_init(void)
> {
> int err;
>
> - printk(banner);
> + pr_info("%s\n", banner);
>
> err = can_proto_register(&bcm_can_proto);
> if (err < 0) {
> - printk(KERN_ERR "can: registration of bcm protocol failed\n");
> + pr_err("registration of bcm protocol failed\n");
> return err;
> }
>
> diff --git a/net/can/gw.c b/net/can/gw.c
> index 3d79b12..e17253f 100644
> --- a/net/can/gw.c
> +++ b/net/can/gw.c
> @@ -39,6 +39,8 @@
> *
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/types.h>
> @@ -59,7 +61,7 @@
>
> #define CAN_GW_VERSION "20101209"
> static __initdata const char banner[] =
> - KERN_INFO "can: netlink gateway (rev " CAN_GW_VERSION ")\n";
> + "netlink gateway (rev " CAN_GW_VERSION ")";
>
> MODULE_DESCRIPTION("PF_CAN netlink gateway");
> MODULE_LICENSE("Dual BSD/GPL");
> @@ -913,7 +915,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
>
> static __init int cgw_module_init(void)
> {
> - printk(banner);
> + pr_info("%s\n", banner);
>
> cgw_cache = kmem_cache_create("can_gw", sizeof(struct cgw_job),
> 0, 0, NULL);
> diff --git a/net/can/proc.c b/net/can/proc.c
> index ba873c3..c3aedf5 100644
> --- a/net/can/proc.c
> +++ b/net/can/proc.c
> @@ -39,6 +39,8 @@
> *
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/module.h>
> #include <linux/proc_fs.h>
> #include <linux/list.h>
> @@ -118,8 +120,7 @@ static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif,
>
> /* see can_stat_update() - this should NEVER happen! */
> if (count > (ULONG_MAX / HZ)) {
> - printk(KERN_ERR "can: calc_rate: count exceeded! %ld\n",
> - count);
> + pr_err("%s: count exceeded! %ld\n", __func__, count);
> return 99999999;
> }
>
> @@ -475,8 +476,7 @@ void can_init_proc(void)
> can_dir = proc_mkdir("can", init_net.proc_net);
>
> if (!can_dir) {
> - printk(KERN_INFO "can: failed to create /proc/net/can . "
> - "CONFIG_PROC_FS missing?\n");
> + pr_info("failed to create /proc/net/can . CONFIG_PROC_FS missing?\n");
> return;
> }
>
> diff --git a/net/can/raw.c b/net/can/raw.c
> index cde1b4a..2875c55 100644
> --- a/net/can/raw.c
> +++ b/net/can/raw.c
> @@ -39,6 +39,8 @@
> *
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/uio.h>
> @@ -56,7 +58,7 @@
>
> #define CAN_RAW_VERSION CAN_VERSION
> static __initdata const char banner[] =
> - KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n";
> + "raw protocol (rev " CAN_RAW_VERSION ")";
>
> MODULE_DESCRIPTION("PF_CAN raw protocol");
> MODULE_LICENSE("Dual BSD/GPL");
> @@ -783,11 +785,11 @@ static __init int raw_module_init(void)
> {
> int err;
>
> - printk(banner);
> + pr_info("%s\n", banner);
>
> err = can_proto_register(&raw_can_proto);
> if (err < 0)
> - printk(KERN_ERR "can: registration of raw protocol failed\n");
> + pr_err("registration of raw protocol failed\n");
>
> return err;
> }
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] can: Update logging style
2011-11-29 20:06 ` Marc Kleine-Budde
@ 2011-11-30 13:43 ` Oliver Hartkopp
2011-11-30 18:23 ` Joe Perches
0 siblings, 1 reply; 5+ messages in thread
From: Oliver Hartkopp @ 2011-11-30 13:43 UTC (permalink / raw)
To: Marc Kleine-Budde
Cc: Joe Perches, Urs Thuermann, David S. Miller, linux-can, netdev,
linux-kernel
On 29.11.2011 21:06, Marc Kleine-Budde wrote:
> On 11/29/2011 07:54 PM, Joe Perches wrote:
>> Use pr_fmt, pr_<level> and pr_<level>_ratelimited.
>> Coalesce format strings.
>>
>> Signed-off-by: Joe Perches <joe@perches.com>
>
> The banners will probably looking a bit different, but I think nobody is
> screen scraping that output :)
>
> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Nobody but me. Therefore it get's a NACK.
Indeed the banners are pretty broken now ...
Before:
can: controller area network core (rev 20090105 abi 8)
NET: Registered protocol family 29
can: raw protocol (rev 20090105)
can: netlink gateway (rev 20101209)
can: broadcast manager protocol (rev 20090105 t)
After Joe's patch:
can: controller area network core (rev 20090105 abi 8)
NET: Registered protocol family 29
can_raw: raw protocol (rev 20090105)
can_gw: netlink gateway (rev 20101209)
can_bcm: broadcast manager protocol (rev 20090105 t)
IMO if you want to use pr_fmt() it should at least look like this:
can: controller area network core (rev 20090105 abi 8)
NET: Registered protocol family 29
can_raw: can raw protocol (rev 20090105)
can_gw: can netlink gateway (rev 20101209)
can_bcm: can broadcast manager protocol (rev 20090105 t)
I'm fine with using pr_fmt() for error/warning output but not for the banner
in the currently suggested way.
Regards,
Oliver
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] can: Update logging style
2011-11-30 13:43 ` Oliver Hartkopp
@ 2011-11-30 18:23 ` Joe Perches
2011-12-01 6:56 ` Oliver Hartkopp
0 siblings, 1 reply; 5+ messages in thread
From: Joe Perches @ 2011-11-30 18:23 UTC (permalink / raw)
To: Oliver Hartkopp
Cc: Marc Kleine-Budde, Urs Thuermann, David S. Miller, linux-can,
netdev, linux-kernel
Use pr_fmt, pr_<level> and pr_<level>_ratelimited.
Coalesce format strings.
V2: Appease Oliver Hartkopp by adding "can" to the banner output.
Signed-off-by: Joe Perches <joe@perches.com>
---
> IMO if you want to use pr_fmt() it should at least look like this:
> can: controller area network core (rev 20090105 abi 8)
> NET: Registered protocol family 29
> can_raw: can raw protocol (rev 20090105)
> can_gw: can netlink gateway (rev 20101209)
> can_bcm: can broadcast manager protocol (rev 20090105 t)
>
> I'm fine with using pr_fmt() for error/warning output but not for the banner
> in the currently suggested way.
I think it's duplicative, but it's not my code.
net/can/af_can.c | 31 ++++++++++++++-----------------
net/can/bcm.c | 14 ++++++++------
net/can/gw.c | 6 ++++--
net/can/proc.c | 8 ++++----
net/can/raw.c | 8 +++++---
5 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 0ce2ad0..c4f0da5 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -40,6 +40,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kmod.h>
@@ -62,8 +64,8 @@
#include "af_can.h"
-static __initdata const char banner[] = KERN_INFO
- "can: controller area network core (" CAN_VERSION_STRING ")\n";
+static __initdata const char banner[] =
+ "controller area network core (" CAN_VERSION_STRING ")";
MODULE_DESCRIPTION("Controller Area Network PF_CAN core");
MODULE_LICENSE("Dual BSD/GPL");
@@ -161,8 +163,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
* return -EPROTONOSUPPORT
*/
if (err)
- printk_ratelimited(KERN_ERR "can: request_module "
- "(can-proto-%d) failed.\n", protocol);
+ pr_err_ratelimited("request_module (can-proto-%d) failed\n",
+ protocol);
cp = can_get_proto(protocol);
}
@@ -505,8 +507,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
d = find_dev_rcv_lists(dev);
if (!d) {
- printk(KERN_ERR "BUG: receive list not found for "
- "dev %s, id %03X, mask %03X\n",
+ pr_err("BUG: receive list not found for dev %s, id %03X, mask %03X\n",
DNAME(dev), can_id, mask);
goto out;
}
@@ -532,8 +533,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
*/
if (!next) {
- printk(KERN_ERR "BUG: receive list entry not found for "
- "dev %s, id %03X, mask %03X\n",
+ pr_err("BUG: receive list entry not found for dev %s, id %03X, mask %03X\n",
DNAME(dev), can_id, mask);
r = NULL;
goto out;
@@ -701,8 +701,7 @@ int can_proto_register(const struct can_proto *cp)
int err = 0;
if (proto < 0 || proto >= CAN_NPROTO) {
- printk(KERN_ERR "can: protocol number %d out of range\n",
- proto);
+ pr_err("protocol number %d out of range\n", proto);
return -EINVAL;
}
@@ -713,8 +712,7 @@ int can_proto_register(const struct can_proto *cp)
mutex_lock(&proto_tab_lock);
if (proto_tab[proto]) {
- printk(KERN_ERR "can: protocol %d already registered\n",
- proto);
+ pr_err("protocol %d already registered\n", proto);
err = -EBUSY;
} else
RCU_INIT_POINTER(proto_tab[proto], cp);
@@ -769,8 +767,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
/* create new dev_rcv_lists for this device */
d = kzalloc(sizeof(*d), GFP_KERNEL);
if (!d) {
- printk(KERN_ERR
- "can: allocation of receive list failed\n");
+ pr_err("allocation of receive list failed\n");
return NOTIFY_DONE;
}
BUG_ON(dev->ml_priv);
@@ -790,8 +787,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
dev->ml_priv = NULL;
}
} else
- printk(KERN_ERR "can: notifier: receive list not "
- "found for dev %s\n", dev->name);
+ pr_err("notifier: receive list not found for dev %s\n",
+ dev->name);
spin_unlock(&can_rcvlists_lock);
@@ -824,7 +821,7 @@ static struct notifier_block can_netdev_notifier __read_mostly = {
static __init int can_init(void)
{
- printk(banner);
+ pr_info("%s\n", banner);
memset(&can_rx_alldev_list, 0, sizeof(can_rx_alldev_list));
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 151b773..540c804 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -39,6 +39,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/interrupt.h>
@@ -77,8 +79,8 @@
(CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))
#define CAN_BCM_VERSION CAN_VERSION
-static __initdata const char banner[] = KERN_INFO
- "can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n";
+static __initdata const char banner[] =
+ "can broadcast manager protocol (rev " CAN_BCM_VERSION " t)";
MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");
MODULE_LICENSE("Dual BSD/GPL");
@@ -729,8 +731,8 @@ static void bcm_rx_unreg(struct net_device *dev, struct bcm_op *op)
/* mark as removed subscription */
op->rx_reg_dev = NULL;
} else
- printk(KERN_ERR "can-bcm: bcm_rx_unreg: registered device "
- "mismatch %p %p\n", op->rx_reg_dev, dev);
+ pr_err("%s: registered device mismatch %p %p\n",
+ __func__, op->rx_reg_dev, dev);
}
/*
@@ -1606,11 +1608,11 @@ static int __init bcm_module_init(void)
{
int err;
- printk(banner);
+ pr_info("%s\n", banner);
err = can_proto_register(&bcm_can_proto);
if (err < 0) {
- printk(KERN_ERR "can: registration of bcm protocol failed\n");
+ pr_err("registration of bcm protocol failed\n");
return err;
}
diff --git a/net/can/gw.c b/net/can/gw.c
index 3d79b12..e17253f 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -39,6 +39,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/types.h>
@@ -59,7 +61,7 @@
#define CAN_GW_VERSION "20101209"
static __initdata const char banner[] =
- KERN_INFO "can: netlink gateway (rev " CAN_GW_VERSION ")\n";
+ "can netlink gateway (rev " CAN_GW_VERSION ")";
MODULE_DESCRIPTION("PF_CAN netlink gateway");
MODULE_LICENSE("Dual BSD/GPL");
@@ -913,7 +915,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
static __init int cgw_module_init(void)
{
- printk(banner);
+ pr_info("%s\n", banner);
cgw_cache = kmem_cache_create("can_gw", sizeof(struct cgw_job),
0, 0, NULL);
diff --git a/net/can/proc.c b/net/can/proc.c
index ba873c3..c3aedf5 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -39,6 +39,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/proc_fs.h>
#include <linux/list.h>
@@ -118,8 +120,7 @@ static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif,
/* see can_stat_update() - this should NEVER happen! */
if (count > (ULONG_MAX / HZ)) {
- printk(KERN_ERR "can: calc_rate: count exceeded! %ld\n",
- count);
+ pr_err("%s: count exceeded! %ld\n", __func__, count);
return 99999999;
}
@@ -475,8 +476,7 @@ void can_init_proc(void)
can_dir = proc_mkdir("can", init_net.proc_net);
if (!can_dir) {
- printk(KERN_INFO "can: failed to create /proc/net/can . "
- "CONFIG_PROC_FS missing?\n");
+ pr_info("failed to create /proc/net/can . CONFIG_PROC_FS missing?\n");
return;
}
diff --git a/net/can/raw.c b/net/can/raw.c
index cde1b4a..2875c55 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -39,6 +39,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/uio.h>
@@ -56,7 +58,7 @@
#define CAN_RAW_VERSION CAN_VERSION
static __initdata const char banner[] =
- KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n";
+ "can raw protocol (rev " CAN_RAW_VERSION ")";
MODULE_DESCRIPTION("PF_CAN raw protocol");
MODULE_LICENSE("Dual BSD/GPL");
@@ -783,11 +785,11 @@ static __init int raw_module_init(void)
{
int err;
- printk(banner);
+ pr_info("%s\n", banner);
err = can_proto_register(&raw_can_proto);
if (err < 0)
- printk(KERN_ERR "can: registration of raw protocol failed\n");
+ pr_err("registration of raw protocol failed\n");
return err;
}
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] can: Update logging style
2011-11-30 18:23 ` Joe Perches
@ 2011-12-01 6:56 ` Oliver Hartkopp
0 siblings, 0 replies; 5+ messages in thread
From: Oliver Hartkopp @ 2011-12-01 6:56 UTC (permalink / raw)
To: Joe Perches
Cc: Marc Kleine-Budde, Urs Thuermann, David S. Miller, linux-can,
netdev, linux-kernel
On 30.11.2011 19:23, Joe Perches wrote:
> Use pr_fmt, pr_<level> and pr_<level>_ratelimited.
> Coalesce format strings.
>
> V2: Appease Oliver Hartkopp by adding "can" to the banner output.
>
> Signed-off-by: Joe Perches <joe@perches.com>
>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Thanks Joe
> ---
>
>> IMO if you want to use pr_fmt() it should at least look like this:
>> can: controller area network core (rev 20090105 abi 8)
>> NET: Registered protocol family 29
>> can_raw: can raw protocol (rev 20090105)
>> can_gw: can netlink gateway (rev 20101209)
>> can_bcm: can broadcast manager protocol (rev 20090105 t)
>>
>> I'm fine with using pr_fmt() for error/warning output but not for the banner
>> in the currently suggested way.
>
> I think it's duplicative, but it's not my code.
>
> net/can/af_can.c | 31 ++++++++++++++-----------------
> net/can/bcm.c | 14 ++++++++------
> net/can/gw.c | 6 ++++--
> net/can/proc.c | 8 ++++----
> net/can/raw.c | 8 +++++---
> 5 files changed, 35 insertions(+), 32 deletions(-)
>
> diff --git a/net/can/af_can.c b/net/can/af_can.c
> index 0ce2ad0..c4f0da5 100644
> --- a/net/can/af_can.c
> +++ b/net/can/af_can.c
> @@ -40,6 +40,8 @@
> *
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/kmod.h>
> @@ -62,8 +64,8 @@
>
> #include "af_can.h"
>
> -static __initdata const char banner[] = KERN_INFO
> - "can: controller area network core (" CAN_VERSION_STRING ")\n";
> +static __initdata const char banner[] =
> + "controller area network core (" CAN_VERSION_STRING ")";
>
> MODULE_DESCRIPTION("Controller Area Network PF_CAN core");
> MODULE_LICENSE("Dual BSD/GPL");
> @@ -161,8 +163,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
> * return -EPROTONOSUPPORT
> */
> if (err)
> - printk_ratelimited(KERN_ERR "can: request_module "
> - "(can-proto-%d) failed.\n", protocol);
> + pr_err_ratelimited("request_module (can-proto-%d) failed\n",
> + protocol);
>
> cp = can_get_proto(protocol);
> }
> @@ -505,8 +507,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
>
> d = find_dev_rcv_lists(dev);
> if (!d) {
> - printk(KERN_ERR "BUG: receive list not found for "
> - "dev %s, id %03X, mask %03X\n",
> + pr_err("BUG: receive list not found for dev %s, id %03X, mask %03X\n",
> DNAME(dev), can_id, mask);
> goto out;
> }
> @@ -532,8 +533,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
> */
>
> if (!next) {
> - printk(KERN_ERR "BUG: receive list entry not found for "
> - "dev %s, id %03X, mask %03X\n",
> + pr_err("BUG: receive list entry not found for dev %s, id %03X, mask %03X\n",
> DNAME(dev), can_id, mask);
> r = NULL;
> goto out;
> @@ -701,8 +701,7 @@ int can_proto_register(const struct can_proto *cp)
> int err = 0;
>
> if (proto < 0 || proto >= CAN_NPROTO) {
> - printk(KERN_ERR "can: protocol number %d out of range\n",
> - proto);
> + pr_err("protocol number %d out of range\n", proto);
> return -EINVAL;
> }
>
> @@ -713,8 +712,7 @@ int can_proto_register(const struct can_proto *cp)
> mutex_lock(&proto_tab_lock);
>
> if (proto_tab[proto]) {
> - printk(KERN_ERR "can: protocol %d already registered\n",
> - proto);
> + pr_err("protocol %d already registered\n", proto);
> err = -EBUSY;
> } else
> RCU_INIT_POINTER(proto_tab[proto], cp);
> @@ -769,8 +767,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
> /* create new dev_rcv_lists for this device */
> d = kzalloc(sizeof(*d), GFP_KERNEL);
> if (!d) {
> - printk(KERN_ERR
> - "can: allocation of receive list failed\n");
> + pr_err("allocation of receive list failed\n");
> return NOTIFY_DONE;
> }
> BUG_ON(dev->ml_priv);
> @@ -790,8 +787,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
> dev->ml_priv = NULL;
> }
> } else
> - printk(KERN_ERR "can: notifier: receive list not "
> - "found for dev %s\n", dev->name);
> + pr_err("notifier: receive list not found for dev %s\n",
> + dev->name);
>
> spin_unlock(&can_rcvlists_lock);
>
> @@ -824,7 +821,7 @@ static struct notifier_block can_netdev_notifier __read_mostly = {
>
> static __init int can_init(void)
> {
> - printk(banner);
> + pr_info("%s\n", banner);
>
> memset(&can_rx_alldev_list, 0, sizeof(can_rx_alldev_list));
>
> diff --git a/net/can/bcm.c b/net/can/bcm.c
> index 151b773..540c804 100644
> --- a/net/can/bcm.c
> +++ b/net/can/bcm.c
> @@ -39,6 +39,8 @@
> *
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/interrupt.h>
> @@ -77,8 +79,8 @@
> (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))
>
> #define CAN_BCM_VERSION CAN_VERSION
> -static __initdata const char banner[] = KERN_INFO
> - "can: broadcast manager protocol (rev " CAN_BCM_VERSION " t)\n";
> +static __initdata const char banner[] =
> + "can broadcast manager protocol (rev " CAN_BCM_VERSION " t)";
>
> MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");
> MODULE_LICENSE("Dual BSD/GPL");
> @@ -729,8 +731,8 @@ static void bcm_rx_unreg(struct net_device *dev, struct bcm_op *op)
> /* mark as removed subscription */
> op->rx_reg_dev = NULL;
> } else
> - printk(KERN_ERR "can-bcm: bcm_rx_unreg: registered device "
> - "mismatch %p %p\n", op->rx_reg_dev, dev);
> + pr_err("%s: registered device mismatch %p %p\n",
> + __func__, op->rx_reg_dev, dev);
> }
>
> /*
> @@ -1606,11 +1608,11 @@ static int __init bcm_module_init(void)
> {
> int err;
>
> - printk(banner);
> + pr_info("%s\n", banner);
>
> err = can_proto_register(&bcm_can_proto);
> if (err < 0) {
> - printk(KERN_ERR "can: registration of bcm protocol failed\n");
> + pr_err("registration of bcm protocol failed\n");
> return err;
> }
>
> diff --git a/net/can/gw.c b/net/can/gw.c
> index 3d79b12..e17253f 100644
> --- a/net/can/gw.c
> +++ b/net/can/gw.c
> @@ -39,6 +39,8 @@
> *
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/types.h>
> @@ -59,7 +61,7 @@
>
> #define CAN_GW_VERSION "20101209"
> static __initdata const char banner[] =
> - KERN_INFO "can: netlink gateway (rev " CAN_GW_VERSION ")\n";
> + "can netlink gateway (rev " CAN_GW_VERSION ")";
>
> MODULE_DESCRIPTION("PF_CAN netlink gateway");
> MODULE_LICENSE("Dual BSD/GPL");
> @@ -913,7 +915,7 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
>
> static __init int cgw_module_init(void)
> {
> - printk(banner);
> + pr_info("%s\n", banner);
>
> cgw_cache = kmem_cache_create("can_gw", sizeof(struct cgw_job),
> 0, 0, NULL);
> diff --git a/net/can/proc.c b/net/can/proc.c
> index ba873c3..c3aedf5 100644
> --- a/net/can/proc.c
> +++ b/net/can/proc.c
> @@ -39,6 +39,8 @@
> *
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/module.h>
> #include <linux/proc_fs.h>
> #include <linux/list.h>
> @@ -118,8 +120,7 @@ static unsigned long calc_rate(unsigned long oldjif, unsigned long newjif,
>
> /* see can_stat_update() - this should NEVER happen! */
> if (count > (ULONG_MAX / HZ)) {
> - printk(KERN_ERR "can: calc_rate: count exceeded! %ld\n",
> - count);
> + pr_err("%s: count exceeded! %ld\n", __func__, count);
> return 99999999;
> }
>
> @@ -475,8 +476,7 @@ void can_init_proc(void)
> can_dir = proc_mkdir("can", init_net.proc_net);
>
> if (!can_dir) {
> - printk(KERN_INFO "can: failed to create /proc/net/can . "
> - "CONFIG_PROC_FS missing?\n");
> + pr_info("failed to create /proc/net/can . CONFIG_PROC_FS missing?\n");
> return;
> }
>
> diff --git a/net/can/raw.c b/net/can/raw.c
> index cde1b4a..2875c55 100644
> --- a/net/can/raw.c
> +++ b/net/can/raw.c
> @@ -39,6 +39,8 @@
> *
> */
>
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/uio.h>
> @@ -56,7 +58,7 @@
>
> #define CAN_RAW_VERSION CAN_VERSION
> static __initdata const char banner[] =
> - KERN_INFO "can: raw protocol (rev " CAN_RAW_VERSION ")\n";
> + "can raw protocol (rev " CAN_RAW_VERSION ")";
>
> MODULE_DESCRIPTION("PF_CAN raw protocol");
> MODULE_LICENSE("Dual BSD/GPL");
> @@ -783,11 +785,11 @@ static __init int raw_module_init(void)
> {
> int err;
>
> - printk(banner);
> + pr_info("%s\n", banner);
>
> err = can_proto_register(&raw_can_proto);
> if (err < 0)
> - printk(KERN_ERR "can: registration of raw protocol failed\n");
> + pr_err("registration of raw protocol failed\n");
>
> return err;
> }
>
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-can" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-12-01 6:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-29 18:54 [PATCH] can: Update logging style Joe Perches
2011-11-29 20:06 ` Marc Kleine-Budde
2011-11-30 13:43 ` Oliver Hartkopp
2011-11-30 18:23 ` Joe Perches
2011-12-01 6:56 ` Oliver Hartkopp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).