tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

pktgen: Convert pr_warning to pr_warn

Use the more common pr_warn.
Realign arguments.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Joe Perches and committed by
David S. Miller 294a0b7f ef423a41

+12 -12
+12 -12
net/core/pktgen.c
··· 506 506 pktgen_reset_all_threads(pn); 507 507 508 508 else 509 - pr_warning("Unknown command: %s\n", data); 509 + pr_warn("Unknown command: %s\n", data); 510 510 511 511 return count; 512 512 } ··· 861 861 pg_result = &(pkt_dev->result[0]); 862 862 863 863 if (count < 1) { 864 - pr_warning("wrong command format\n"); 864 + pr_warn("wrong command format\n"); 865 865 return -EINVAL; 866 866 } 867 867 868 868 max = count; 869 869 tmp = count_trail_chars(user_buffer, max); 870 870 if (tmp < 0) { 871 - pr_warning("illegal format\n"); 871 + pr_warn("illegal format\n"); 872 872 return tmp; 873 873 } 874 874 i = tmp; ··· 2056 2056 ntxq = pkt_dev->odev->real_num_tx_queues; 2057 2057 2058 2058 if (ntxq <= pkt_dev->queue_map_min) { 2059 - pr_warning("WARNING: Requested queue_map_min (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", 2060 - pkt_dev->queue_map_min, (ntxq ?: 1) - 1, ntxq, 2061 - pkt_dev->odevname); 2059 + pr_warn("WARNING: Requested queue_map_min (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", 2060 + pkt_dev->queue_map_min, (ntxq ?: 1) - 1, ntxq, 2061 + pkt_dev->odevname); 2062 2062 pkt_dev->queue_map_min = (ntxq ?: 1) - 1; 2063 2063 } 2064 2064 if (pkt_dev->queue_map_max >= ntxq) { 2065 - pr_warning("WARNING: Requested queue_map_max (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", 2066 - pkt_dev->queue_map_max, (ntxq ?: 1) - 1, ntxq, 2067 - pkt_dev->odevname); 2065 + pr_warn("WARNING: Requested queue_map_max (zero-based) (%d) exceeds valid range [0 - %d] for (%d) queues on %s, resetting\n", 2066 + pkt_dev->queue_map_max, (ntxq ?: 1) - 1, ntxq, 2067 + pkt_dev->odevname); 2068 2068 pkt_dev->queue_map_max = (ntxq ?: 1) - 1; 2069 2069 } 2070 2070 ··· 3173 3173 int nr_frags = pkt_dev->skb ? skb_shinfo(pkt_dev->skb)->nr_frags : -1; 3174 3174 3175 3175 if (!pkt_dev->running) { 3176 - pr_warning("interface: %s is already stopped\n", 3177 - pkt_dev->odevname); 3176 + pr_warn("interface: %s is already stopped\n", 3177 + pkt_dev->odevname); 3178 3178 return -EINVAL; 3179 3179 } 3180 3180 ··· 3692 3692 pr_debug("remove_device pkt_dev=%p\n", pkt_dev); 3693 3693 3694 3694 if (pkt_dev->running) { 3695 - pr_warning("WARNING: trying to remove a running interface, stopping it now\n"); 3695 + pr_warn("WARNING: trying to remove a running interface, stopping it now\n"); 3696 3696 pktgen_stop_device(pkt_dev); 3697 3697 } 3698 3698