Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f80e696854c95725cf7faf9776e02f00600780d3

Authored by Joe Perches
Committed by Linus Torvalds
1 parent 4b3ed61485

tile: use pr_warn instead of pr_warning 

Use the more common pr_warn.

Coalesce formats, realign arguments.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 15 additions and 18 deletions Side-by-side Diff

arch/tile/kernel/setup.c
Diff comments   View file @ f80e696
... ... @@ -534,11 +534,10 @@
534 534 }
535 535 }
536 536 physpages -= dropped_pages;
537   - pr_warning("Only using %ldMB memory;"
538   - " ignoring %ldMB.\n",
539   - physpages >> (20 - PAGE_SHIFT),
540   - dropped_pages >> (20 - PAGE_SHIFT));
541   - pr_warning("Consider using a larger page size.\n");
  537 + pr_warn("Only using %ldMB memory - ignoring %ldMB\n",
  538 + physpages >> (20 - PAGE_SHIFT),
  539 + dropped_pages >> (20 - PAGE_SHIFT));
  540 + pr_warn("Consider using a larger page size\n");
542 541 }
543 542 #endif
544 543  
... ... @@ -566,9 +565,8 @@
566 565  
567 566 #ifndef __tilegx__
568 567 if (node_end_pfn[0] > MAXMEM_PFN) {
569   - pr_warning("Only using %ldMB LOWMEM.\n",
570   - MAXMEM>>20);
571   - pr_warning("Use a HIGHMEM enabled kernel.\n");
  568 + pr_warn("Only using %ldMB LOWMEM\n", MAXMEM >> 20);
  569 + pr_warn("Use a HIGHMEM enabled kernel\n");
572 570 max_low_pfn = MAXMEM_PFN;
573 571 max_pfn = MAXMEM_PFN;
574 572 node_end_pfn[0] = MAXMEM_PFN;
... ... @@ -1112,8 +1110,8 @@
1112 1110 fd = hv_fs_findfile((HV_VirtAddr) initramfs_file);
1113 1111 if (fd == HV_ENOENT) {
1114 1112 if (set_initramfs_file) {
1115   - pr_warning("No such hvfs initramfs file '%s'\n",
1116   - initramfs_file);
  1113 + pr_warn("No such hvfs initramfs file '%s'\n",
  1114 + initramfs_file);
1117 1115 return;
1118 1116 } else {
1119 1117 /* Try old backwards-compatible name. */
... ... @@ -1126,8 +1124,8 @@
1126 1124 stat = hv_fs_fstat(fd);
1127 1125 BUG_ON(stat.size < 0);
1128 1126 if (stat.flags & HV_FS_ISDIR) {
1129   - pr_warning("Ignoring hvfs file '%s': it's a directory.\n",
1130   - initramfs_file);
  1127 + pr_warn("Ignoring hvfs file '%s': it's a directory\n",
  1128 + initramfs_file);
1131 1129 return;
1132 1130 }
1133 1131 initrd = alloc_bootmem_pages(stat.size);
... ... @@ -1185,9 +1183,8 @@
1185 1183 HV_Topology topology = hv_inquire_topology();
1186 1184 BUG_ON(topology.coord.x != 0 || topology.coord.y != 0);
1187 1185 if (topology.width != 1 || topology.height != 1) {
1188   - pr_warning("Warning: booting UP kernel on %dx%d grid;"
1189   - " will ignore all but first tile.\n",
1190   - topology.width, topology.height);
  1186 + pr_warn("Warning: booting UP kernel on %dx%d grid; will ignore all but first tile\n",
  1187 + topology.width, topology.height);
1191 1188 }
1192 1189 #endif
1193 1190  
... ... @@ -1393,7 +1390,7 @@
1393 1390  
1394 1391 static int __init dataplane(char *str)
1395 1392 {
1396   - pr_warning("WARNING: dataplane support disabled in this kernel\n");
  1393 + pr_warn("WARNING: dataplane support disabled in this kernel\n");
1397 1394 return 0;
1398 1395 }
1399 1396  
... ... @@ -1411,8 +1408,8 @@
1411 1408 len = hv_get_command_line((HV_VirtAddr) boot_command_line,
1412 1409 COMMAND_LINE_SIZE);
1413 1410 if (boot_command_line[0])
1414   - pr_warning("WARNING: ignoring dynamic command line \"%s\"\n",
1415   - boot_command_line);
  1411 + pr_warn("WARNING: ignoring dynamic command line \"%s\"\n",
  1412 + boot_command_line);
1416 1413 strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
1417 1414 #else
1418 1415 char *hv_cmdline;