diff options
author | Len Brown <len.brown@intel.com> | 2006-06-26 23:04:31 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-27 00:00:54 -0400 |
commit | cece92969762b8ed7930d4e23008b76b06411dee (patch) | |
tree | ab3d84b71971f0405ab2b1b36d9fdd39b0bda55e /drivers/acpi/pci_link.c | |
parent | 64dedfb8fdbbc4fabb8c131e4b597cd4bc7f3881 (diff) |
ACPI: un-export ACPI_WARNING() -- use printk(KERN_WARNING...)
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/pci_link.c')
-rw-r--r-- | drivers/acpi/pci_link.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 415b2628fe85..6d903bfe5197 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
@@ -116,15 +116,15 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context) | |||
116 | { | 116 | { |
117 | struct acpi_resource_irq *p = &resource->data.irq; | 117 | struct acpi_resource_irq *p = &resource->data.irq; |
118 | if (!p || !p->interrupt_count) { | 118 | if (!p || !p->interrupt_count) { |
119 | ACPI_WARNING((AE_INFO, "Blank IRQ resource")); | 119 | printk(KERN_WARNING PREFIX "Blank IRQ resource\n"); |
120 | return_ACPI_STATUS(AE_OK); | 120 | return_ACPI_STATUS(AE_OK); |
121 | } | 121 | } |
122 | for (i = 0; | 122 | for (i = 0; |
123 | (i < p->interrupt_count | 123 | (i < p->interrupt_count |
124 | && i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) { | 124 | && i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) { |
125 | if (!p->interrupts[i]) { | 125 | if (!p->interrupts[i]) { |
126 | ACPI_WARNING((AE_INFO, "Invalid IRQ %d", | 126 | printk(KERN_WARNING PREFIX "Invalid IRQ %d\n", |
127 | p->interrupts[i])); | 127 | p->interrupts[i]); |
128 | continue; | 128 | continue; |
129 | } | 129 | } |
130 | link->irq.possible[i] = p->interrupts[i]; | 130 | link->irq.possible[i] = p->interrupts[i]; |
@@ -140,16 +140,16 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context) | |||
140 | struct acpi_resource_extended_irq *p = | 140 | struct acpi_resource_extended_irq *p = |
141 | &resource->data.extended_irq; | 141 | &resource->data.extended_irq; |
142 | if (!p || !p->interrupt_count) { | 142 | if (!p || !p->interrupt_count) { |
143 | ACPI_WARNING((AE_INFO, | 143 | printk(KERN_WARNING PREFIX |
144 | "Blank EXT IRQ resource")); | 144 | "Blank EXT IRQ resource\n"); |
145 | return_ACPI_STATUS(AE_OK); | 145 | return_ACPI_STATUS(AE_OK); |
146 | } | 146 | } |
147 | for (i = 0; | 147 | for (i = 0; |
148 | (i < p->interrupt_count | 148 | (i < p->interrupt_count |
149 | && i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) { | 149 | && i < ACPI_PCI_LINK_MAX_POSSIBLE); i++) { |
150 | if (!p->interrupts[i]) { | 150 | if (!p->interrupts[i]) { |
151 | ACPI_WARNING((AE_INFO, "Invalid IRQ %d", | 151 | printk(KERN_WARNING PREFIX "Invalid IRQ %d\n", |
152 | p->interrupts[i])); | 152 | p->interrupts[i]); |
153 | continue; | 153 | continue; |
154 | } | 154 | } |
155 | link->irq.possible[i] = p->interrupts[i]; | 155 | link->irq.possible[i] = p->interrupts[i]; |
@@ -223,8 +223,8 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context) | |||
223 | * extended IRQ descriptors must | 223 | * extended IRQ descriptors must |
224 | * return at least 1 IRQ | 224 | * return at least 1 IRQ |
225 | */ | 225 | */ |
226 | ACPI_WARNING((AE_INFO, | 226 | printk(KERN_WARNING PREFIX |
227 | "Blank EXT IRQ resource")); | 227 | "Blank EXT IRQ resource\n"); |
228 | return_ACPI_STATUS(AE_OK); | 228 | return_ACPI_STATUS(AE_OK); |
229 | } | 229 | } |
230 | *irq = p->interrupts[0]; | 230 | *irq = p->interrupts[0]; |
@@ -381,10 +381,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) | |||
381 | goto end; | 381 | goto end; |
382 | } | 382 | } |
383 | if (!link->device->status.enabled) { | 383 | if (!link->device->status.enabled) { |
384 | ACPI_WARNING((AE_INFO, | 384 | printk(KERN_WARNING PREFIX |
385 | "%s [%s] disabled and referenced, BIOS bug", | 385 | "%s [%s] disabled and referenced, BIOS bug\n", |
386 | acpi_device_name(link->device), | 386 | acpi_device_name(link->device), |
387 | acpi_device_bid(link->device))); | 387 | acpi_device_bid(link->device)); |
388 | } | 388 | } |
389 | 389 | ||
390 | /* Query _CRS, set link->irq.active */ | 390 | /* Query _CRS, set link->irq.active */ |
@@ -402,10 +402,10 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) | |||
402 | * policy: when _CRS doesn't return what we just _SRS | 402 | * policy: when _CRS doesn't return what we just _SRS |
403 | * assume _SRS worked and override _CRS value. | 403 | * assume _SRS worked and override _CRS value. |
404 | */ | 404 | */ |
405 | ACPI_WARNING((AE_INFO, | 405 | printk(KERN_WARNING PREFIX |
406 | "%s [%s] BIOS reported IRQ %d, using IRQ %d", | 406 | "%s [%s] BIOS reported IRQ %d, using IRQ %d\n", |
407 | acpi_device_name(link->device), | 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 | link->irq.active = irq; | 409 | link->irq.active = irq; |
410 | } | 410 | } |
411 | 411 | ||
@@ -555,8 +555,8 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link) | |||
555 | */ | 555 | */ |
556 | if (i == link->irq.possible_count) { | 556 | if (i == link->irq.possible_count) { |
557 | if (acpi_strict) | 557 | if (acpi_strict) |
558 | ACPI_WARNING((AE_INFO, "_CRS %d not found" | 558 | printk(KERN_WARNING PREFIX "_CRS %d not found" |
559 | " in _PRS", link->irq.active)); | 559 | " in _PRS\n", link->irq.active); |
560 | link->irq.active = 0; | 560 | link->irq.active = 0; |
561 | } | 561 | } |
562 | 562 | ||