Commit 294a0b7f authored by Joe Perches's avatar Joe Perches Committed by David S. Miller

pktgen: Convert pr_warning to pr_warn

Use the more common pr_warn.
Realign arguments.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ef423a41
...@@ -506,7 +506,7 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf, ...@@ -506,7 +506,7 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf,
pktgen_reset_all_threads(pn); pktgen_reset_all_threads(pn);
else else
pr_warning("Unknown command: %s\n", data); pr_warn("Unknown command: %s\n", data);
return count; return count;
} }
...@@ -861,14 +861,14 @@ static ssize_t pktgen_if_write(struct file *file, ...@@ -861,14 +861,14 @@ static ssize_t pktgen_if_write(struct file *file,
pg_result = &(pkt_dev->result[0]); pg_result = &(pkt_dev->result[0]);
if (count < 1) { if (count < 1) {
pr_warning("wrong command format\n"); pr_warn("wrong command format\n");
return -EINVAL; return -EINVAL;
} }
max = count; max = count;
tmp = count_trail_chars(user_buffer, max); tmp = count_trail_chars(user_buffer, max);
if (tmp < 0) { if (tmp < 0) {
pr_warning("illegal format\n"); pr_warn("illegal format\n");
return tmp; return tmp;
} }
i = tmp; i = tmp;
...@@ -2056,15 +2056,15 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev) ...@@ -2056,15 +2056,15 @@ static void pktgen_setup_inject(struct pktgen_dev *pkt_dev)
ntxq = pkt_dev->odev->real_num_tx_queues; ntxq = pkt_dev->odev->real_num_tx_queues;
if (ntxq <= pkt_dev->queue_map_min) { if (ntxq <= pkt_dev->queue_map_min) {
pr_warning("WARNING: Requested queue_map_min (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", pr_warn("WARNING: Requested queue_map_min (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n",
pkt_dev->queue_map_min, (ntxq ?: 1) - 1, ntxq, pkt_dev->queue_map_min, (ntxq ?: 1) - 1, ntxq,
pkt_dev->odevname); pkt_dev->odevname);
pkt_dev->queue_map_min = (ntxq ?: 1) - 1; pkt_dev->queue_map_min = (ntxq ?: 1) - 1;
} }
if (pkt_dev->queue_map_max >= ntxq) { if (pkt_dev->queue_map_max >= ntxq) {
pr_warning("WARNING: Requested queue_map_max (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", pr_warn("WARNING: Requested queue_map_max (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n",
pkt_dev->queue_map_max, (ntxq ?: 1) - 1, ntxq, pkt_dev->queue_map_max, (ntxq ?: 1) - 1, ntxq,
pkt_dev->odevname); pkt_dev->odevname);
pkt_dev->queue_map_max = (ntxq ?: 1) - 1; pkt_dev->queue_map_max = (ntxq ?: 1) - 1;
} }
...@@ -3173,8 +3173,8 @@ static int pktgen_stop_device(struct pktgen_dev *pkt_dev) ...@@ -3173,8 +3173,8 @@ static int pktgen_stop_device(struct pktgen_dev *pkt_dev)
int nr_frags = pkt_dev->skb ? skb_shinfo(pkt_dev->skb)->nr_frags : -1; int nr_frags = pkt_dev->skb ? skb_shinfo(pkt_dev->skb)->nr_frags : -1;
if (!pkt_dev->running) { if (!pkt_dev->running) {
pr_warning("interface: %s is already stopped\n", pr_warn("interface: %s is already stopped\n",
pkt_dev->odevname); pkt_dev->odevname);
return -EINVAL; return -EINVAL;
} }
...@@ -3692,7 +3692,7 @@ static int pktgen_remove_device(struct pktgen_thread *t, ...@@ -3692,7 +3692,7 @@ static int pktgen_remove_device(struct pktgen_thread *t,
pr_debug("remove_device pkt_dev=%p\n", pkt_dev); pr_debug("remove_device pkt_dev=%p\n", pkt_dev);
if (pkt_dev->running) { if (pkt_dev->running) {
pr_warning("WARNING: trying to remove a running interface, stopping it now\n"); pr_warn("WARNING: trying to remove a running interface, stopping it now\n");
pktgen_stop_device(pkt_dev); pktgen_stop_device(pkt_dev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment