| Message ID | 90c4322fefc5e2d4778862abd051e6eb12c0284b.1299086044.git.joe@perches.com |
|---|---|
| State | Rejected, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Joe Perches <joe@perches.com> Date: Wed, 2 Mar 2011 09:18:12 -0800 > Add pr_fmt > > Signed-off-by: Joe Perches <joe@perches.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: David Miller <davem@davemloft.net> Date: Thu, 03 Mar 2011 12:21:53 -0800 (PST) > From: Joe Perches <joe@perches.com> > Date: Wed, 2 Mar 2011 09:18:12 -0800 > >> Add pr_fmt >> >> Signed-off-by: Joe Perches <joe@perches.com> > > Applied. Something is busted with this change, although I can't quite figure it out myself: drivers/net/eql.c: In function ‘eql_init_module’: drivers/net/eql.c:596:2: error: expected ‘)’ before ‘version’
diff --git a/drivers/net/eql.c b/drivers/net/eql.c index 0cb1cf9..ffda358 100644 --- a/drivers/net/eql.c +++ b/drivers/net/eql.c @@ -111,6 +111,8 @@ * Sorry, I had to rewrite most of this for 2.5.x -DaveM */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/capability.h> #include <linux/module.h> #include <linux/kernel.h> @@ -204,8 +206,8 @@ static int eql_open(struct net_device *dev) equalizer_t *eql = netdev_priv(dev); /* XXX We should force this off automatically for the user. */ - printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on " - "your slave devices.\n", dev->name); + netdev_info(dev, + "remember to turn off Van-Jacobson compression on your slave devices\n"); BUG_ON(!list_empty(&eql->queue.all_slaves)); @@ -591,7 +593,7 @@ static int __init eql_init_module(void) { int err; - printk(version); + pr_info(version); dev_eql = alloc_netdev(sizeof(equalizer_t), "eql", eql_setup); if (!dev_eql)
Add pr_fmt Signed-off-by: Joe Perches <joe@perches.com> --- drivers/net/eql.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)