diff options
| author | Joe Perches <joe@perches.com> | 2013-07-24 14:13:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-24 15:11:20 -0700 |
| commit | 0ec473b5267d01762b610d57e168b0401a137f3a (patch) | |
| tree | a60db6a702bd3664f189f3b64ecdd91d35b8a3ce /drivers/staging/gdm724x/netlink_k.c | |
| parent | aee9440d78bda37ae07f27c862aee4ec8ddf97ea (diff) | |
staging: gdm724x: Update logging
Make the logging prefixes match the module names
by adding #define pr_fmt(fmt) KBUILD_MODNAME and
converting printks to netdev_<level> when a
struct netdevice * is available and and pr_<level>
when not.
Remove embedded prefixes.
Add missing terminating newlines.
Remove an unnecessary rx-dropped message.
Remove an unnecessary temporary variable.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gdm724x/netlink_k.c')
| -rw-r--r-- | drivers/staging/gdm724x/netlink_k.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/staging/gdm724x/netlink_k.c b/drivers/staging/gdm724x/netlink_k.c index 9819bf014857..90004a7a16c2 100644 --- a/drivers/staging/gdm724x/netlink_k.c +++ b/drivers/staging/gdm724x/netlink_k.c @@ -11,6 +11,8 @@ * GNU General Public License for more details. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/version.h> #include <linux/export.h> #include <linux/etherdevice.h> @@ -48,19 +50,19 @@ static void netlink_rcv_cb(struct sk_buff *skb) int ifindex; if (!rcv_cb) { - printk(KERN_ERR "glte: nl cb - unregistered\n"); + pr_err("nl cb - unregistered\n"); return; } if (skb->len < NLMSG_SPACE(0)) { - printk(KERN_ERR "glte: nl cb - invalid skb length\n"); + pr_err("nl cb - invalid skb length\n"); return; } nlh = (struct nlmsghdr *)skb->data; if (skb->len < nlh->nlmsg_len || nlh->nlmsg_len > ND_MAX_MSG_LEN) { - printk(KERN_ERR "glte: nl cb - invalid length (%d,%d)\n", + pr_err("nl cb - invalid length (%d,%d)\n", skb->len, nlh->nlmsg_len); return; } @@ -74,7 +76,7 @@ static void netlink_rcv_cb(struct sk_buff *skb) rcv_cb(dev, nlh->nlmsg_type, msg, mlen); dev_put(dev); } else { - printk(KERN_ERR "glte: nl cb - dev (%d) not found\n", ifindex); + pr_err("nl cb - dev (%d) not found\n", ifindex); } } @@ -152,7 +154,7 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) return len; if (ret != -ESRCH) - printk(KERN_ERR "glte: nl broadcast g=%d, t=%d, l=%d, r=%d\n", + pr_err("nl broadcast g=%d, t=%d, l=%d, r=%d\n", group, type, len, ret); else if (netlink_has_listeners(sock, group+1)) return -EAGAIN; |