diff options
Diffstat (limited to 'drivers/staging/gdm72xx/netlink_k.c')
-rw-r--r-- | drivers/staging/gdm72xx/netlink_k.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/drivers/staging/gdm72xx/netlink_k.c b/drivers/staging/gdm72xx/netlink_k.c index 20d0aec52e7..52c25ba5831 100644 --- a/drivers/staging/gdm72xx/netlink_k.c +++ b/drivers/staging/gdm72xx/netlink_k.c | |||
@@ -11,6 +11,8 @@ | |||
11 | * GNU General Public License for more details. | 11 | * GNU General Public License for more details. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
15 | |||
14 | #include <linux/module.h> | 16 | #include <linux/module.h> |
15 | #include <linux/etherdevice.h> | 17 | #include <linux/etherdevice.h> |
16 | #include <linux/netlink.h> | 18 | #include <linux/netlink.h> |
@@ -54,8 +56,8 @@ static void netlink_rcv_cb(struct sk_buff *skb) | |||
54 | 56 | ||
55 | if (skb->len < nlh->nlmsg_len || | 57 | if (skb->len < nlh->nlmsg_len || |
56 | nlh->nlmsg_len > ND_MAX_MSG_LEN) { | 58 | nlh->nlmsg_len > ND_MAX_MSG_LEN) { |
57 | printk(KERN_ERR "Invalid length (%d,%d)\n", skb->len, | 59 | netdev_err(skb->dev, "Invalid length (%d,%d)\n", |
58 | nlh->nlmsg_len); | 60 | skb->len, nlh->nlmsg_len); |
59 | return; | 61 | return; |
60 | } | 62 | } |
61 | 63 | ||
@@ -69,10 +71,11 @@ static void netlink_rcv_cb(struct sk_buff *skb) | |||
69 | rcv_cb(dev, nlh->nlmsg_type, msg, mlen); | 71 | rcv_cb(dev, nlh->nlmsg_type, msg, mlen); |
70 | dev_put(dev); | 72 | dev_put(dev); |
71 | } else | 73 | } else |
72 | printk(KERN_ERR "dev_get_by_index(%d) " | 74 | netdev_err(skb->dev, |
73 | "is not found.\n", ifindex); | 75 | "dev_get_by_index(%d) is not found.\n", |
76 | ifindex); | ||
74 | } else | 77 | } else |
75 | printk(KERN_ERR "Unregistered Callback\n"); | 78 | netdev_err(skb->dev, "Unregistered Callback\n"); |
76 | } | 79 | } |
77 | } | 80 | } |
78 | 81 | ||
@@ -116,14 +119,14 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) | |||
116 | int ret = 0; | 119 | int ret = 0; |
117 | 120 | ||
118 | if (group > ND_MAX_GROUP) { | 121 | if (group > ND_MAX_GROUP) { |
119 | printk(KERN_ERR "Group %d is invalied.\n", group); | 122 | pr_err("Group %d is invalied.\n", group); |
120 | printk(KERN_ERR "Valid group is 0 ~ %d.\n", ND_MAX_GROUP); | 123 | pr_err("Valid group is 0 ~ %d.\n", ND_MAX_GROUP); |
121 | return -EINVAL; | 124 | return -EINVAL; |
122 | } | 125 | } |
123 | 126 | ||
124 | skb = alloc_skb(NLMSG_SPACE(len), GFP_ATOMIC); | 127 | skb = alloc_skb(NLMSG_SPACE(len), GFP_ATOMIC); |
125 | if (!skb) { | 128 | if (!skb) { |
126 | printk(KERN_ERR "netlink_broadcast ret=%d\n", ret); | 129 | pr_err("netlink_broadcast ret=%d\n", ret); |
127 | return -ENOMEM; | 130 | return -ENOMEM; |
128 | } | 131 | } |
129 | 132 | ||
@@ -144,8 +147,8 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) | |||
144 | return len; | 147 | return len; |
145 | else { | 148 | else { |
146 | if (ret != -ESRCH) { | 149 | if (ret != -ESRCH) { |
147 | printk(KERN_ERR "netlink_broadcast g=%d, t=%d, l=%d, r=%d\n", | 150 | pr_err("netlink_broadcast g=%d, t=%d, l=%d, r=%d\n", |
148 | group, type, len, ret); | 151 | group, type, len, ret); |
149 | } | 152 | } |
150 | ret = 0; | 153 | ret = 0; |
151 | } | 154 | } |