wan: Update to current logging forms
Use pr_fmt, pr_<level> and netdev_<level> as appropriate. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
c75bb2c6f0
commit
23efcb738e
@@ -20,6 +20,8 @@
|
||||
* 2000-11-14 Henner Eisen dev_hold/put, NETDEV_GOING_DOWN support
|
||||
*/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/errno.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/socket.h>
|
||||
@@ -165,13 +167,11 @@ static netdev_tx_t lapbeth_xmit(struct sk_buff *skb,
|
||||
break;
|
||||
case X25_IFACE_CONNECT:
|
||||
if ((err = lapb_connect_request(dev)) != LAPB_OK)
|
||||
printk(KERN_ERR "lapbeth: lapb_connect_request "
|
||||
"error: %d\n", err);
|
||||
pr_err("lapb_connect_request error: %d\n", err);
|
||||
goto drop;
|
||||
case X25_IFACE_DISCONNECT:
|
||||
if ((err = lapb_disconnect_request(dev)) != LAPB_OK)
|
||||
printk(KERN_ERR "lapbeth: lapb_disconnect_request "
|
||||
"err: %d\n", err);
|
||||
pr_err("lapb_disconnect_request err: %d\n", err);
|
||||
/* Fall thru */
|
||||
default:
|
||||
goto drop;
|
||||
@@ -180,7 +180,7 @@ static netdev_tx_t lapbeth_xmit(struct sk_buff *skb,
|
||||
skb_pull(skb, 1);
|
||||
|
||||
if ((err = lapb_data_request(dev, skb)) != LAPB_OK) {
|
||||
printk(KERN_ERR "lapbeth: lapb_data_request error - %d\n", err);
|
||||
pr_err("lapb_data_request error - %d\n", err);
|
||||
goto drop;
|
||||
}
|
||||
out:
|
||||
@@ -220,7 +220,7 @@ static void lapbeth_connected(struct net_device *dev, int reason)
|
||||
struct sk_buff *skb = dev_alloc_skb(1);
|
||||
|
||||
if (!skb) {
|
||||
printk(KERN_ERR "lapbeth: out of memory\n");
|
||||
pr_err("out of memory\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -237,7 +237,7 @@ static void lapbeth_disconnected(struct net_device *dev, int reason)
|
||||
struct sk_buff *skb = dev_alloc_skb(1);
|
||||
|
||||
if (!skb) {
|
||||
printk(KERN_ERR "lapbeth: out of memory\n");
|
||||
pr_err("out of memory\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -277,7 +277,7 @@ static int lapbeth_open(struct net_device *dev)
|
||||
int err;
|
||||
|
||||
if ((err = lapb_register(dev, &lapbeth_callbacks)) != LAPB_OK) {
|
||||
printk(KERN_ERR "lapbeth: lapb_register error - %d\n", err);
|
||||
pr_err("lapb_register error: %d\n", err);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -292,7 +292,7 @@ static int lapbeth_close(struct net_device *dev)
|
||||
netif_stop_queue(dev);
|
||||
|
||||
if ((err = lapb_unregister(dev)) != LAPB_OK)
|
||||
printk(KERN_ERR "lapbeth: lapb_unregister error - %d\n", err);
|
||||
pr_err("lapb_unregister error: %d\n", err);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user