From: Joe Perches <joe@perches.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Subject: [PATCH 3/3 v2] eql: Convert printks to pr_<level> and netdev_<level>
Date: Thu, 03 Mar 2011 13:08:12 -0800 [thread overview]
Message-ID: <1299186492.4338.166.camel@Joe-Laptop> (raw)
In-Reply-To: <20110303.125951.200370524.davem@davemloft.net>
Add pr_fmt.
Removed trailing "\n" from version,
add back via pr_info("%s\n", version);
Signed-off-by: Joe Perches <joe@perches.com>
---
> Something is busted with this change, although I can't quite figure it
> out myself:
Joined of a fixed string with an __initconst string.
drivers/net/eql.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index 0cb1cf9..a59cf96 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>
@@ -162,7 +164,7 @@ static void eql_timer(unsigned long param)
}
static const char version[] __initconst =
- "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)\n";
+ "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)";
static const struct net_device_ops eql_netdev_ops = {
.ndo_open = eql_open,
@@ -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("%s\n", version);
dev_eql = alloc_netdev(sizeof(equalizer_t), "eql", eql_setup);
if (!dev_eql)
next prev parent reply other threads:[~2011-03-03 21:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-02 17:18 [PATCH 1/3] tun: Convert logging messages to pr_<level> and tun_debug Joe Perches
2011-03-02 17:18 ` [PATCH 2/3] mii: Convert printks to netdev_info Joe Perches
2011-03-03 20:21 ` David Miller
2011-03-03 20:29 ` Joe Perches
2011-03-03 20:32 ` David Miller
2011-03-03 20:46 ` [PATCH 2/3 v2] " Joe Perches
2011-03-03 20:56 ` David Miller
2011-03-02 17:18 ` [PATCH 3/3] eql: Convert printks to pr_<level> and netdev_<level> Joe Perches
2011-03-03 20:21 ` David Miller
2011-03-03 20:59 ` David Miller
2011-03-03 21:08 ` Joe Perches [this message]
2011-03-03 21:30 ` [PATCH 3/3 v2] " David Miller
2011-03-03 20:21 ` [PATCH 1/3] tun: Convert logging messages to pr_<level> and tun_debug David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1299186492.4338.166.camel@Joe-Laptop \
--to=joe@perches.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox