Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28b7deae authored by Fabian Frederick's avatar Fabian Frederick Committed by David S. Miller
Browse files

wimax: convert printk to pr_foo() 



Use current logging functions and add module name prefix.

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 505e907d

net/wimax/id-table.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ void wimax_id_table_release(void) 
#endif

	spin_lock(&wimax_id_table_lock);

	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);

		WARN_ON(1);

	}

net/wimax/op-msg.c

+4 −5
Original line number Diff line number Diff line
@@ -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),

			      WIMAX_GNL_MSG_DATA);

	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;

	}

	*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),

			      WIMAX_GNL_MSG_DATA);

	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 nla_data(nla);
@@ -232,7 +232,7 @@ ssize_t wimax_msg_len(struct sk_buff *msg) 
	nla = nlmsg_find_attr(nlh, sizeof(struct genlmsghdr),

			      WIMAX_GNL_MSG_DATA);

	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 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);

	result = -ENODEV;

	if (info->attrs[WIMAX_GNL_MSG_IFIDX] == NULL) {

		printk(KERN_ERR "WIMAX_GNL_MSG_FROM_USER: can't find IFIDX "

		       "attribute\n");

		pr_err("WIMAX_GNL_MSG_FROM_USER: can't find IFIDX attribute\n");

		goto error_no_wimax_dev;

	}

	ifindex = nla_get_u32(info->attrs[WIMAX_GNL_MSG_IFIDX]);

net/wimax/op-reset.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	result = -ENODEV;

	if (info->attrs[WIMAX_GNL_RESET_IFIDX] == NULL) {

		printk(KERN_ERR "WIMAX_GNL_OP_RFKILL: can't find IFIDX "

			"attribute\n");

		pr_err("WIMAX_GNL_OP_RFKILL: can't find IFIDX attribute\n");

		goto error_no_wimax_dev;

	}

	ifindex = nla_get_u32(info->attrs[WIMAX_GNL_RESET_IFIDX]);

net/wimax/op-rfkill.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	result = -ENODEV;

	if (info->attrs[WIMAX_GNL_RFKILL_IFIDX] == NULL) {

		printk(KERN_ERR "WIMAX_GNL_OP_RFKILL: can't find IFIDX "

			"attribute\n");

		pr_err("WIMAX_GNL_OP_RFKILL: can't find IFIDX attribute\n");

		goto error_no_wimax_dev;

	}

	ifindex = nla_get_u32(info->attrs[WIMAX_GNL_RFKILL_IFIDX]);

net/wimax/op-state-get.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	result = -ENODEV;

	if (info->attrs[WIMAX_GNL_STGET_IFIDX] == NULL) {

		printk(KERN_ERR "WIMAX_GNL_OP_STATE_GET: can't find IFIDX "

			"attribute\n");

		pr_err("WIMAX_GNL_OP_STATE_GET: can't find IFIDX attribute\n");

		goto error_no_wimax_dev;

	}

	ifindex = nla_get_u32(info->attrs[WIMAX_GNL_STGET_IFIDX]);