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

ACPI: un-export ACPI_WARNING() -- use printk(KERN_WARNING...)

Signed-off-by: Len Brown <len.brown@intel.com>

Len Brown cece9296 64dedfb8

+54 -54
+6 -6
drivers/acpi/bus.c
··· 214 214 } 215 215 } 216 216 if (!device->power.states[state].flags.valid) { 217 - ACPI_WARNING((AE_INFO, "Device does not support D%d", state)); 217 + printk(KERN_WARNING PREFIX "Device does not support D%d\n", state); 218 218 return_VALUE(-ENODEV); 219 219 } 220 220 if (device->parent && (state < device->parent->power.state)) { 221 - ACPI_WARNING((AE_INFO, 221 + printk(KERN_WARNING PREFIX 222 222 "Cannot set device to a higher-powered" 223 - " state than parent")); 223 + " state than parent\n"); 224 224 return_VALUE(-ENODEV); 225 225 } 226 226 ··· 263 263 264 264 end: 265 265 if (result) 266 - ACPI_WARNING((AE_INFO, 267 - "Transitioning device [%s] to D%d", 268 - device->pnp.bus_id, state)); 266 + printk(KERN_WARNING PREFIX 267 + "Transitioning device [%s] to D%d\n", 268 + device->pnp.bus_id, state); 269 269 else 270 270 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 271 271 "Device [%s] transitioned to D%d\n",
+1 -1
drivers/acpi/hotkey.c
··· 983 983 984 984 } 985 985 } else { 986 - ACPI_WARNING((AE_INFO, "Not supported")); 986 + printk(KERN_WARNING "Not supported\n"); 987 987 return_VALUE(-EINVAL); 988 988 } 989 989 return_VALUE(count);
+4 -4
drivers/acpi/pci_irq.c
··· 269 269 entry->link.index, triggering, 270 270 polarity, link); 271 271 if (irq < 0) { 272 - ACPI_WARNING((AE_INFO, 273 - "Invalid IRQ link routing entry")); 272 + printk(KERN_WARNING PREFIX 273 + "Invalid IRQ link routing entry\n"); 274 274 return_VALUE(-1); 275 275 } 276 276 } else { ··· 379 379 } 380 380 381 381 if (irq < 0) { 382 - ACPI_WARNING((AE_INFO, "Unable to derive IRQ for device %s", 383 - pci_name(dev))); 382 + printk(KERN_WARNING PREFIX "Unable to derive IRQ for device %s\n", 383 + pci_name(dev)); 384 384 return_VALUE(-1); 385 385 } 386 386
+17 -17
drivers/acpi/pci_link.c
··· 116 116 { 117 117 struct acpi_resource_irq *p = &resource->data.irq; 118 118 if (!p || !p->interrupt_count) { 119 - ACPI_WARNING((AE_INFO, "Blank IRQ resource")); 119 + printk(KERN_WARNING PREFIX "Blank IRQ resource\n"); 120 120 return_ACPI_STATUS(AE_OK); 121 121 } 122 122 for (i = 0; 123 123 (i < p->interrupt_count 124 124 && i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) { 125 125 if (!p->interrupts[i]) { 126 - ACPI_WARNING((AE_INFO, "Invalid IRQ %d", 127 - p->interrupts[i])); 126 + printk(KERN_WARNING PREFIX "Invalid IRQ %d\n", 127 + p->interrupts[i]); 128 128 continue; 129 129 } 130 130 link->irq.possible[i] = p->interrupts[i]; ··· 140 140 struct acpi_resource_extended_irq *p = 141 141 &resource->data.extended_irq; 142 142 if (!p || !p->interrupt_count) { 143 - ACPI_WARNING((AE_INFO, 144 - "Blank EXT IRQ resource")); 143 + printk(KERN_WARNING PREFIX 144 + "Blank EXT IRQ resource\n"); 145 145 return_ACPI_STATUS(AE_OK); 146 146 } 147 147 for (i = 0; 148 148 (i < p->interrupt_count 149 149 && i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) { 150 150 if (!p->interrupts[i]) { 151 - ACPI_WARNING((AE_INFO, "Invalid IRQ %d", 152 - p->interrupts[i])); 151 + printk(KERN_WARNING PREFIX "Invalid IRQ %d\n", 152 + p->interrupts[i]); 153 153 continue; 154 154 } 155 155 link->irq.possible[i] = p->interrupts[i]; ··· 223 223 * extended IRQ descriptors must 224 224 * return at least 1 IRQ 225 225 */ 226 - ACPI_WARNING((AE_INFO, 227 - "Blank EXT IRQ resource")); 226 + printk(KERN_WARNING PREFIX 227 + "Blank EXT IRQ resource\n"); 228 228 return_ACPI_STATUS(AE_OK); 229 229 } 230 230 *irq = p->interrupts[0]; ··· 381 381 goto end; 382 382 } 383 383 if (!link->device->status.enabled) { 384 - ACPI_WARNING((AE_INFO, 385 - "%s [%s] disabled and referenced, BIOS bug", 384 + printk(KERN_WARNING PREFIX 385 + "%s [%s] disabled and referenced, BIOS bug\n", 386 386 acpi_device_name(link->device), 387 - acpi_device_bid(link->device))); 387 + acpi_device_bid(link->device)); 388 388 } 389 389 390 390 /* Query _CRS, set link->irq.active */ ··· 402 402 * policy: when _CRS doesn't return what we just _SRS 403 403 * assume _SRS worked and override _CRS value. 404 404 */ 405 - ACPI_WARNING((AE_INFO, 406 - "%s [%s] BIOS reported IRQ %d, using IRQ %d", 405 + printk(KERN_WARNING PREFIX 406 + "%s [%s] BIOS reported IRQ %d, using IRQ %d\n", 407 407 acpi_device_name(link->device), 408 - acpi_device_bid(link->device), link->irq.active, irq)); 408 + acpi_device_bid(link->device), link->irq.active, irq); 409 409 link->irq.active = irq; 410 410 } 411 411 ··· 555 555 */ 556 556 if (i == link->irq.possible_count) { 557 557 if (acpi_strict) 558 - ACPI_WARNING((AE_INFO, "_CRS %d not found" 559 - " in _PRS", link->irq.active)); 558 + printk(KERN_WARNING PREFIX "_CRS %d not found" 559 + " in _PRS\n", link->irq.active); 560 560 link->irq.active = 0; 561 561 } 562 562
+3 -3
drivers/acpi/power.c
··· 105 105 106 106 result = acpi_bus_get_device(handle, &device); 107 107 if (result) { 108 - ACPI_WARNING((AE_INFO, "Getting context [%p]", handle)); 108 + printk(KERN_WARNING PREFIX "Getting context [%p]\n", handle); 109 109 return_VALUE(result); 110 110 } 111 111 ··· 441 441 device->power.state = state; 442 442 end: 443 443 if (result) 444 - ACPI_WARNING((AE_INFO, "Transitioning device [%s] to D%d", 445 - device->pnp.bus_id, state)); 444 + printk(KERN_WARNING PREFIX "Transitioning device [%s] to D%d\n", 445 + device->pnp.bus_id, state); 446 446 447 447 return_VALUE(result); 448 448 }
+1 -1
drivers/acpi/processor_throttling.c
··· 196 196 } 197 197 /* TBD: Support duty_cycle values that span bit 4. */ 198 198 else if ((pr->throttling.duty_offset + pr->throttling.duty_width) > 4) { 199 - ACPI_WARNING((AE_INFO, "duty_cycle spans bit 4")); 199 + printk(KERN_WARNING PREFIX "duty_cycle spans bit 4\n"); 200 200 return_VALUE(0); 201 201 } 202 202
+9 -9
drivers/acpi/thermal.c
··· 384 384 tz->trips.passive.flags.valid = 0; 385 385 386 386 if (!tz->trips.passive.flags.valid) 387 - ACPI_WARNING((AE_INFO, "Invalid passive threshold")); 387 + printk(KERN_WARNING PREFIX "Invalid passive threshold\n"); 388 388 else 389 389 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 390 390 "Found passive threshold [%lu]\n", ··· 469 469 return_VALUE(-EINVAL); 470 470 471 471 if (tz->temperature >= tz->trips.critical.temperature) { 472 - ACPI_WARNING((AE_INFO, "Critical trip point")); 472 + printk(KERN_WARNING PREFIX "Critical trip point\n"); 473 473 tz->trips.critical.flags.enabled = 1; 474 474 } else if (tz->trips.critical.flags.enabled) 475 475 tz->trips.critical.flags.enabled = 0; ··· 500 500 return_VALUE(-EINVAL); 501 501 502 502 if (tz->temperature >= tz->trips.hot.temperature) { 503 - ACPI_WARNING((AE_INFO, "Hot trip point")); 503 + printk(KERN_WARNING PREFIX "Hot trip point\n"); 504 504 tz->trips.hot.flags.enabled = 1; 505 505 } else if (tz->trips.hot.flags.enabled) 506 506 tz->trips.hot.flags.enabled = 0; ··· 640 640 handles[j], 641 641 ACPI_STATE_D0); 642 642 if (result) { 643 - ACPI_WARNING((AE_INFO, 644 - "Unable to turn cooling device [%p] 'on'", 643 + printk(KERN_WARNING PREFIX 644 + "Unable to turn cooling device [%p] 'on'\n", 645 645 active->devices. 646 - handles[j])); 646 + handles[j]); 647 647 continue; 648 648 } 649 649 active->flags.enabled = 1; ··· 665 665 result = acpi_bus_set_power(active->devices.handles[j], 666 666 ACPI_STATE_D3); 667 667 if (result) { 668 - ACPI_WARNING((AE_INFO, 669 - "Unable to turn cooling device [%p] 'off'", 670 - active->devices.handles[j])); 668 + printk(KERN_WARNING PREFIX 669 + "Unable to turn cooling device [%p] 'off'\n", 670 + active->devices.handles[j]); 671 671 continue; 672 672 } 673 673 active->flags.enabled = 0;
+1 -1
drivers/acpi/utilities/utmisc.c
··· 978 978 acpi_os_vprintf(format, args); 979 979 acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); 980 980 } 981 - EXPORT_SYMBOL(acpi_ut_warning); 981 + 982 982 void ACPI_INTERNAL_VAR_XFACE 983 983 acpi_ut_info(char *module_name, u32 line_number, char *format, ...) 984 984 {
+12 -12
drivers/acpi/utils.c
··· 62 62 63 63 if (!package || (package->type != ACPI_TYPE_PACKAGE) 64 64 || (package->package.count < 1)) { 65 - ACPI_WARNING((AE_INFO, "Invalid package argument")); 65 + printk(KERN_WARNING PREFIX "Invalid package argument\n"); 66 66 return_ACPI_STATUS(AE_BAD_PARAMETER); 67 67 } 68 68 69 69 if (!format || !format->pointer || (format->length < 1)) { 70 - ACPI_WARNING((AE_INFO, "Invalid format argument")); 70 + printk(KERN_WARNING PREFIX "Invalid format argument\n"); 71 71 return_ACPI_STATUS(AE_BAD_PARAMETER); 72 72 } 73 73 74 74 if (!buffer) { 75 - ACPI_WARNING((AE_INFO, "Invalid buffer argument")); 75 + printk(KERN_WARNING PREFIX "Invalid buffer argument\n"); 76 76 return_ACPI_STATUS(AE_BAD_PARAMETER); 77 77 } 78 78 79 79 format_count = (format->length / sizeof(char)) - 1; 80 80 if (format_count > package->package.count) { 81 - ACPI_WARNING((AE_INFO, "Format specifies more objects [%d]" 82 - " than exist in package [%d].", 83 - format_count, package->package.count)); 81 + printk(KERN_WARNING PREFIX "Format specifies more objects [%d]" 82 + " than exist in package [%d].\n", 83 + format_count, package->package.count); 84 84 return_ACPI_STATUS(AE_BAD_DATA); 85 85 } 86 86 ··· 112 112 tail_offset += sizeof(char *); 113 113 break; 114 114 default: 115 - ACPI_WARNING((AE_INFO, "Invalid package element" 115 + printk(KERN_WARNING PREFIX "Invalid package element" 116 116 " [%d]: got number, expecing" 117 - " [%c]", 118 - i, format_string[i])); 117 + " [%c]\n", 118 + i, format_string[i]); 119 119 return_ACPI_STATUS(AE_BAD_DATA); 120 120 break; 121 121 } ··· 138 138 tail_offset += sizeof(u8 *); 139 139 break; 140 140 default: 141 - ACPI_WARNING((AE_INFO, "Invalid package element" 141 + printk(KERN_WARNING PREFIX "Invalid package element" 142 142 " [%d] got string/buffer," 143 - " expecing [%c]", 144 - i, format_string[i])); 143 + " expecing [%c]\n", 144 + i, format_string[i]); 145 145 return_ACPI_STATUS(AE_BAD_DATA); 146 146 break; 147 147 }