mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-10 07:00:48 +00:00
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>
This commit is contained in:
parent
967faf3b71
commit
63f9742516
@ -111,6 +111,8 @@
|
|||||||
* Sorry, I had to rewrite most of this for 2.5.x -DaveM
|
* 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/capability.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
@ -162,7 +164,7 @@ static void eql_timer(unsigned long param)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static const char version[] __initconst =
|
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 = {
|
static const struct net_device_ops eql_netdev_ops = {
|
||||||
.ndo_open = eql_open,
|
.ndo_open = eql_open,
|
||||||
@ -204,8 +206,8 @@ static int eql_open(struct net_device *dev)
|
|||||||
equalizer_t *eql = netdev_priv(dev);
|
equalizer_t *eql = netdev_priv(dev);
|
||||||
|
|
||||||
/* XXX We should force this off automatically for the user. */
|
/* XXX We should force this off automatically for the user. */
|
||||||
printk(KERN_INFO "%s: remember to turn off Van-Jacobson compression on "
|
netdev_info(dev,
|
||||||
"your slave devices.\n", dev->name);
|
"remember to turn off Van-Jacobson compression on your slave devices\n");
|
||||||
|
|
||||||
BUG_ON(!list_empty(&eql->queue.all_slaves));
|
BUG_ON(!list_empty(&eql->queue.all_slaves));
|
||||||
|
|
||||||
@ -591,7 +593,7 @@ static int __init eql_init_module(void)
|
|||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
printk(version);
|
pr_info("%s\n", version);
|
||||||
|
|
||||||
dev_eql = alloc_netdev(sizeof(equalizer_t), "eql", eql_setup);
|
dev_eql = alloc_netdev(sizeof(equalizer_t), "eql", eql_setup);
|
||||||
if (!dev_eql)
|
if (!dev_eql)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user