Skip to content

Commit 63f9742

Browse files
JoePerchesdavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 967faf3 commit 63f9742

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

drivers/net/eql.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@
111111
* Sorry, I had to rewrite most of this for 2.5.x -DaveM
112112
*/
113113

114+
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
115+
114116
#include <linux/capability.h>
115117
#include <linux/module.h>
116118
#include <linux/kernel.h>
@@ -162,7 +164,7 @@ static void eql_timer(unsigned long param)
162164
}
163165

164166
static const char version[] __initconst =
165-
"Equalizer2002: Simon Janes ([email protected]) and David S. Miller ([email protected])\n";
167+
"Equalizer2002: Simon Janes ([email protected]) and David S. Miller ([email protected])";
166168

167169
static const struct net_device_ops eql_netdev_ops = {
168170
.ndo_open = eql_open,
@@ -204,8 +206,8 @@ static int eql_open(struct net_device *dev)
204206
equalizer_t *eql = netdev_priv(dev);
205207

206208
/* XXX We should force this off automatically for the user. */
207-
printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on "
208-
"your slave devices.\n", dev->name);
209+
netdev_info(dev,
210+
"remember to turn off Van-Jacobson compression on your slave devices\n");
209211

210212
BUG_ON(!list_empty(&eql->queue.all_slaves));
211213

@@ -591,7 +593,7 @@ static int __init eql_init_module(void)
591593
{
592594
int err;
593595

594-
printk(version);
596+
pr_info("%s\n", version);
595597

596598
dev_eql = alloc_netdev(sizeof(equalizer_t), "eql", eql_setup);
597599
if (!dev_eql)

0 commit comments

Comments
 (0)