Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / net / ethernet / tile / tilepro.c

diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c
index 3faf03fce827b7a6530cd23e0f4d37f14dcc6bb7..fb12d31cfcf6342b481e5dfcabcb4fa0a83fea22 100644 (file)
--- a/drivers/net/ethernet/tile/tilepro.c
+++ b/drivers/net/ethernet/tile/tilepro.c
@@ -956,7 +956,7 @@ static int tile_net_open_aux(struct net_device *dev)
         */
        if (hv_dev_pwrite(priv->hv_devhdl, 0, (HV_VirtAddr)&dummy,
                          sizeof(dummy), NETIO_IPP_START_SHIM_OFF) < 0) {
-               pr_warning("Failed to start LIPP/LEPP.\n");
+               pr_warn("Failed to start LIPP/LEPP\n");
                return -EIO;
        }
 
@@ -2399,8 +2399,7 @@ static int __init network_cpus_setup(char *str)
 {
        int rc = cpulist_parse_crop(str, &network_cpus_map);
        if (rc != 0) {
-               pr_warning("network_cpus=%s: malformed cpu list\n",
-                      str);
+               pr_warn("network_cpus=%s: malformed cpu list\n", str);
        } else {
 
                /* Remove dedicated cpus. */
@@ -2409,8 +2408,7 @@ static int __init network_cpus_setup(char *str)
 
 
                if (cpumask_empty(&network_cpus_map)) {
-                       pr_warning("Ignoring network_cpus='%s'.\n",
-                              str);
+                       pr_warn("Ignoring network_cpus='%s'\n", str);
                } else {
                        char buf[1024];
                        cpulist_scnprintf(buf, sizeof(buf), &network_cpus_map);