redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

wimax: convert printk to pr_foo() 

Use current logging functions and add module name prefix.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
wifi-calibration
Fabian Frederick 2014-10-07 22:12:03 +02:00 committed by David S. Miller
parent 505e907db3
commit 28b7deae75
7 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/wimax/id-table.c
View File

@ -137,7 +137,7 @@ void wimax_id_table_release(void)
#endif #endif
spin_lock(&wimax_id_table_lock); spin_lock(&wimax_id_table_lock);
list_for_each_entry(wimax_dev, &wimax_id_table, id_table_node) { list_for_each_entry(wimax_dev, &wimax_id_table, id_table_node) {
printk(KERN_ERR "BUG: %s wimax_dev %p ifindex %d not cleared\n", pr_err("BUG: %s wimax_dev %p ifindex %d not cleared\n",
__func__, wimax_dev, wimax_dev->net_dev->ifindex); __func__, wimax_dev, wimax_dev->net_dev->ifindex);
WARN_ON(1); WARN_ON(1);
} }

9
net/wimax/op-msg.c
View File

@ -189,7 +189,7 @@ const void *wimax_msg_data_len(struct sk_buff *msg, size_t *size)
nla = nlmsg_find_attr(nlh, sizeof(struct genlmsghdr), nla = nlmsg_find_attr(nlh, sizeof(struct genlmsghdr),
WIMAX_GNL_MSG_DATA); WIMAX_GNL_MSG_DATA);
if (nla == NULL) { if (nla == NULL) {
printk(KERN_ERR "Cannot find attribute WIMAX_GNL_MSG_DATA\n"); pr_err("Cannot find attribute WIMAX_GNL_MSG_DATA\n");
return NULL; return NULL;
} }
*size = nla_len(nla); *size = nla_len(nla);
@ -211,7 +211,7 @@ const void *wimax_msg_data(struct sk_buff *msg)
nla = nlmsg_find_attr(nlh, sizeof(struct genlmsghdr), nla = nlmsg_find_attr(nlh, sizeof(struct genlmsghdr),
WIMAX_GNL_MSG_DATA); WIMAX_GNL_MSG_DATA);
if (nla == NULL) { if (nla == NULL) {
printk(KERN_ERR "Cannot find attribute WIMAX_GNL_MSG_DATA\n"); pr_err("Cannot find attribute WIMAX_GNL_MSG_DATA\n");
return NULL; return NULL;
} }
return nla_data(nla); return nla_data(nla);
@ -232,7 +232,7 @@ ssize_t wimax_msg_len(struct sk_buff *msg)
nla = nlmsg_find_attr(nlh, sizeof(struct genlmsghdr), nla = nlmsg_find_attr(nlh, sizeof(struct genlmsghdr),
WIMAX_GNL_MSG_DATA); WIMAX_GNL_MSG_DATA);
if (nla == NULL) { if (nla == NULL) {
printk(KERN_ERR "Cannot find attribute WIMAX_GNL_MSG_DATA\n"); pr_err("Cannot find attribute WIMAX_GNL_MSG_DATA\n");
return -EINVAL; return -EINVAL;
} }
return nla_len(nla); return nla_len(nla);
@ -343,8 +343,7 @@ int wimax_gnl_doit_msg_from_user(struct sk_buff *skb, struct genl_info *info)
d_fnstart(3, NULL, "(skb %p info %p)\n", skb, info); d_fnstart(3, NULL, "(skb %p info %p)\n", skb, info);
result = -ENODEV; result = -ENODEV;
if (info->attrs[WIMAX_GNL_MSG_IFIDX] == NULL) { if (info->attrs[WIMAX_GNL_MSG_IFIDX] == NULL) {
printk(KERN_ERR "WIMAX_GNL_MSG_FROM_USER: can't find IFIDX " pr_err("WIMAX_GNL_MSG_FROM_USER: can't find IFIDX attribute\n");
"attribute\n");
goto error_no_wimax_dev; goto error_no_wimax_dev;
} }
ifindex = nla_get_u32(info->attrs[WIMAX_GNL_MSG_IFIDX]); ifindex = nla_get_u32(info->attrs[WIMAX_GNL_MSG_IFIDX]);

3
net/wimax/op-reset.c
View File

@ -107,8 +107,7 @@ int wimax_gnl_doit_reset(struct sk_buff *skb, struct genl_info *info)
d_fnstart(3, NULL, "(skb %p info %p)\n", skb, info); d_fnstart(3, NULL, "(skb %p info %p)\n", skb, info);
result = -ENODEV; result = -ENODEV;
if (info->attrs[WIMAX_GNL_RESET_IFIDX] == NULL) { if (info->attrs[WIMAX_GNL_RESET_IFIDX] == NULL) {
printk(KERN_ERR "WIMAX_GNL_OP_RFKILL: can't find IFIDX " pr_err("WIMAX_GNL_OP_RFKILL: can't find IFIDX attribute\n");
"attribute\n");
goto error_no_wimax_dev; goto error_no_wimax_dev;
} }
ifindex = nla_get_u32(info->attrs[WIMAX_GNL_RESET_IFIDX]); ifindex = nla_get_u32(info->attrs[WIMAX_GNL_RESET_IFIDX]);

3
net/wimax/op-rfkill.c
View File

@ -421,8 +421,7 @@ int wimax_gnl_doit_rfkill(struct sk_buff *skb, struct genl_info *info)
d_fnstart(3, NULL, "(skb %p info %p)\n", skb, info); d_fnstart(3, NULL, "(skb %p info %p)\n", skb, info);
result = -ENODEV; result = -ENODEV;
if (info->attrs[WIMAX_GNL_RFKILL_IFIDX] == NULL) { if (info->attrs[WIMAX_GNL_RFKILL_IFIDX] == NULL) {
printk(KERN_ERR "WIMAX_GNL_OP_RFKILL: can't find IFIDX " pr_err("WIMAX_GNL_OP_RFKILL: can't find IFIDX attribute\n");
"attribute\n");
goto error_no_wimax_dev; goto error_no_wimax_dev;
} }
ifindex = nla_get_u32(info->attrs[WIMAX_GNL_RFKILL_IFIDX]); ifindex = nla_get_u32(info->attrs[WIMAX_GNL_RFKILL_IFIDX]);

3
net/wimax/op-state-get.c
View File

@ -49,8 +49,7 @@ int wimax_gnl_doit_state_get(struct sk_buff *skb, struct genl_info *info)
d_fnstart(3, NULL, "(skb %p info %p)\n", skb, info); d_fnstart(3, NULL, "(skb %p info %p)\n", skb, info);
result = -ENODEV; result = -ENODEV;
if (info->attrs[WIMAX_GNL_STGET_IFIDX] == NULL) { if (info->attrs[WIMAX_GNL_STGET_IFIDX] == NULL) {
printk(KERN_ERR "WIMAX_GNL_OP_STATE_GET: can't find IFIDX " pr_err("WIMAX_GNL_OP_STATE_GET: can't find IFIDX attribute\n");
"attribute\n");
goto error_no_wimax_dev; goto error_no_wimax_dev;
} }
ifindex = nla_get_u32(info->attrs[WIMAX_GNL_STGET_IFIDX]); ifindex = nla_get_u32(info->attrs[WIMAX_GNL_STGET_IFIDX]);

7
net/wimax/stack.c
View File

@ -191,8 +191,8 @@ void __check_new_state(enum wimax_st old_state, enum wimax_st new_state,
unsigned int allowed_states_bm) unsigned int allowed_states_bm)
{ {
if (WARN_ON(((1 << new_state) & allowed_states_bm) == 0)) { if (WARN_ON(((1 << new_state) & allowed_states_bm) == 0)) {
printk(KERN_ERR "SW BUG! Forbidden state change %u -> %u\n", pr_err("SW BUG! Forbidden state change %u -> %u\n",
old_state, new_state); old_state, new_state);
} }
} }
@ -602,8 +602,7 @@ int __init wimax_subsys_init(void)
wimax_gnl_ops, wimax_gnl_ops,
wimax_gnl_mcgrps); wimax_gnl_mcgrps);
if (unlikely(result < 0)) { if (unlikely(result < 0)) {
printk(KERN_ERR "cannot register generic netlink family: %d\n", pr_err("cannot register generic netlink family: %d\n", result);
result);
goto error_register_family; goto error_register_family;
} }

6
net/wimax/wimax-internal.h
View File

@ -30,6 +30,12 @@
#define __WIMAX_INTERNAL_H__ #define __WIMAX_INTERNAL_H__
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef pr_fmt
#undef pr_fmt
#endif
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/device.h> #include <linux/device.h>
#include <net/wimax.h> #include <net/wimax.h>