diff options
| author | Joe Perches <joe@perches.com> | 2011-06-26 21:01:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-27 09:09:46 +0200 |
| commit | 12a3bfefc8c1e43ddb50950cb74f8a11d680567a (patch) | |
| tree | ff974d28811618a51ab8dcbef1588a1022cb9c74 /drivers/net/wan/hdlc_x25.c | |
| parent | be2net: fix initialization of vlan_prio_bmap (diff) | |
| download | linux-12a3bfefc8c1e43ddb50950cb74f8a11d680567a.tar.xz linux-12a3bfefc8c1e43ddb50950cb74f8a11d680567a.zip | |
generic_hdlc: 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>
Diffstat (limited to 'drivers/net/wan/hdlc_x25.c')
| -rw-r--r-- | drivers/net/wan/hdlc_x25.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c index 70527e5a54a2..56aeb011cb3d 100644 --- a/drivers/net/wan/hdlc_x25.c +++ b/drivers/net/wan/hdlc_x25.c @@ -34,7 +34,7 @@ static void x25_connect_disconnect(struct net_device *dev, int reason, int code) unsigned char *ptr; if ((skb = dev_alloc_skb(1)) == NULL) { - printk(KERN_ERR "%s: out of memory\n", dev->name); + netdev_err(dev, "out of memory\n"); return; } @@ -106,9 +106,8 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev) /* Send connect confirm. msg to level 3 */ x25_connected(dev, 0); else - printk(KERN_ERR "%s: LAPB connect request " - "failed, error code = %i\n", - dev->name, result); + netdev_err(dev, "LAPB connect request failed, error code = %i\n", + result); } break; @@ -118,9 +117,8 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev) /* Send disconnect confirm. msg to level 3 */ x25_disconnected(dev, 0); else - printk(KERN_ERR "%s: LAPB disconnect request " - "failed, error code = %i\n", - dev->name, result); + netdev_err(dev, "LAPB disconnect request failed, error code = %i\n", + result); } break; |