aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-03-03 16:30:20 -0500
committerDavid S. Miller <davem@davemloft.net>2011-03-03 16:30:20 -0500
commit63f97425166a1a16279c1a5720e9dfcb2c12ad1b (patch)
tree6711769568b97d1bfcaae5fd4d89d78c6234bbcf
parent967faf3b718e887301adb1636c2295f03d3c694f (diff)
eql: Convert printks to pr_<level> and netdev_<level>
Add pr_fmt. Removed trailing "\n" from version, add back via pr_info("%s\n", version); Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/eql.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/eql.c b/drivers/net/eql.c
index 0cb1cf9cf4b0..a59cf961a436 100644
--- a/drivers/net/eql.c
+++ b/drivers/net/eql.c
@@ -111,6 +111,8 @@
111 * Sorry, I had to rewrite most of this for 2.5.x -DaveM 111 * Sorry, I had to rewrite most of this for 2.5.x -DaveM
112 */ 112 */
113 113
114#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
115
114#include <linux/capability.h> 116#include <linux/capability.h>
115#include <linux/module.h> 117#include <linux/module.h>
116#include <linux/kernel.h> 118#include <linux/kernel.h>
@@ -162,7 +164,7 @@ static void eql_timer(unsigned long param)
162} 164}
163 165
164static const char version[] __initconst = 166static const char version[] __initconst =
165 "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)\n"; 167 "Equalizer2002: Simon Janes (simon@ncm.com) and David S. Miller (davem@redhat.com)";
166 168
167static const struct net_device_ops eql_netdev_ops = { 169static const struct net_device_ops eql_netdev_ops = {
168 .ndo_open = eql_open, 170 .ndo_open = eql_open,
@@ -204,8 +206,8 @@ static int eql_open(struct net_device *dev)
204 equalizer_t *eql = netdev_priv(dev); 206 equalizer_t *eql = netdev_priv(dev);
205 207
206 /* XXX We should force this off automatically for the user. */ 208 /* XXX We should force this off automatically for the user. */
207 printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on " 209 netdev_info(dev,
208 "your slave devices.\n", dev->name); 210 "remember to turn off Van-Jacobson compression on your slave devices\n");
209 211
210 BUG_ON(!list_empty(&eql->queue.all_slaves)); 212 BUG_ON(!list_empty(&eql->queue.all_slaves));
211 213
@@ -591,7 +593,7 @@ static int __init eql_init_module(void)
591{ 593{
592 int err; 594 int err;
593 595
594 printk(version); 596 pr_info("%s\n", version);
595 597
596 dev_eql = alloc_netdev(sizeof(equalizer_t), "eql", eql_setup); 598 dev_eql = alloc_netdev(sizeof(equalizer_t), "eql", eql_setup);
597 if (!dev_eql) 599 if (!dev_eql)