aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-26 23:41:38 -0400
committerLen Brown <len.brown@intel.com>2006-06-27 00:01:06 -0400
commit6468463abd7051fcc29f3ee7c931f9bbbb26f5a4 (patch)
treed18eae04fe6c8f7d257077cc6056cd9c6f424e0d /drivers
parentcece92969762b8ed7930d4e23008b76b06411dee (diff)
ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/acpi_memhotplug.c18
-rw-r--r--drivers/acpi/button.c4
-rw-r--r--drivers/acpi/container.c2
-rw-r--r--drivers/acpi/ec.c4
-rw-r--r--drivers/acpi/fan.c2
-rw-r--r--drivers/acpi/hotkey.c16
-rw-r--r--drivers/acpi/osl.c2
-rw-r--r--drivers/acpi/pci_bind.c12
-rw-r--r--drivers/acpi/pci_irq.c2
-rw-r--r--drivers/acpi/pci_link.c36
-rw-r--r--drivers/acpi/pci_root.c10
-rw-r--r--drivers/acpi/power.c8
-rw-r--r--drivers/acpi/processor_core.c30
-rw-r--r--drivers/acpi/processor_idle.c4
-rw-r--r--drivers/acpi/processor_perflib.c12
-rw-r--r--drivers/acpi/processor_thermal.c8
-rw-r--r--drivers/acpi/scan.c2
-rw-r--r--drivers/acpi/thermal.c2
-rw-r--r--drivers/acpi/utilities/utmisc.c1
-rw-r--r--drivers/acpi/utils.c20
-rw-r--r--drivers/acpi/video.c8
21 files changed, 101 insertions, 102 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index e49d327ccf4c..c7c8d537a063 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -187,7 +187,7 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
187 /* Get the range from the _CRS */ 187 /* Get the range from the _CRS */
188 result = acpi_memory_get_device_resources(mem_device); 188 result = acpi_memory_get_device_resources(mem_device);
189 if (result) { 189 if (result) {
190 ACPI_ERROR((AE_INFO, "get_device_resources failed")); 190 printk(KERN_ERR PREFIX "get_device_resources failed\n");
191 mem_device->state = MEMORY_INVALID_STATE; 191 mem_device->state = MEMORY_INVALID_STATE;
192 return result; 192 return result;
193 } 193 }
@@ -198,7 +198,7 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
198 */ 198 */
199 result = add_memory(mem_device->start_addr, mem_device->length); 199 result = add_memory(mem_device->start_addr, mem_device->length);
200 if (result) { 200 if (result) {
201 ACPI_ERROR((AE_INFO, "add_memory failed")); 201 printk(KERN_ERR PREFIX "add_memory failed\n");
202 mem_device->state = MEMORY_INVALID_STATE; 202 mem_device->state = MEMORY_INVALID_STATE;
203 return result; 203 return result;
204 } 204 }
@@ -286,14 +286,14 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
286 ACPI_DEBUG_PRINT((ACPI_DB_INFO, 286 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
287 "\nReceived DEVICE CHECK notification for device\n")); 287 "\nReceived DEVICE CHECK notification for device\n"));
288 if (acpi_memory_get_device(handle, &mem_device)) { 288 if (acpi_memory_get_device(handle, &mem_device)) {
289 ACPI_ERROR((AE_INFO, "Cannot find driver data")); 289 printk(KERN_ERR PREFIX "Cannot find driver data\n");
290 return_VOID; 290 return_VOID;
291 } 291 }
292 292
293 if (!acpi_memory_check_device(mem_device)) { 293 if (!acpi_memory_check_device(mem_device)) {
294 if (acpi_memory_enable_device(mem_device)) 294 if (acpi_memory_enable_device(mem_device))
295 ACPI_ERROR((AE_INFO, 295 printk(KERN_ERR PREFIX
296 "Cannot enable memory device")); 296 "Cannot enable memory device\n");
297 } 297 }
298 break; 298 break;
299 case ACPI_NOTIFY_EJECT_REQUEST: 299 case ACPI_NOTIFY_EJECT_REQUEST:
@@ -301,12 +301,12 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
301 "\nReceived EJECT REQUEST notification for device\n")); 301 "\nReceived EJECT REQUEST notification for device\n"));
302 302
303 if (acpi_bus_get_device(handle, &device)) { 303 if (acpi_bus_get_device(handle, &device)) {
304 ACPI_ERROR((AE_INFO, "Device doesn't exist")); 304 printk(KERN_ERR PREFIX "Device doesn't exist\n");
305 break; 305 break;
306 } 306 }
307 mem_device = acpi_driver_data(device); 307 mem_device = acpi_driver_data(device);
308 if (!mem_device) { 308 if (!mem_device) {
309 ACPI_ERROR((AE_INFO, "Driver Data is NULL")); 309 printk(KERN_ERR PREFIX "Driver Data is NULL\n");
310 break; 310 break;
311 } 311 }
312 312
@@ -317,8 +317,8 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
317 * with generic sysfs driver 317 * with generic sysfs driver
318 */ 318 */
319 if (acpi_memory_disable_device(mem_device)) 319 if (acpi_memory_disable_device(mem_device))
320 ACPI_ERROR((AE_INFO, 320 printk(KERN_ERR PREFIX
321 "Disable memory device\n")); 321 "Disable memory device\n");
322 /* 322 /*
323 * TBD: Invoke acpi_bus_remove to cleanup data structures 323 * TBD: Invoke acpi_bus_remove to cleanup data structures
324 */ 324 */
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index a8717da32a7a..63db284bb5cf 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -345,8 +345,8 @@ static int acpi_button_add(struct acpi_device *device)
345 sprintf(acpi_device_class(device), "%s/%s", 345 sprintf(acpi_device_class(device), "%s/%s",
346 ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID); 346 ACPI_BUTTON_CLASS, ACPI_BUTTON_SUBCLASS_LID);
347 } else { 347 } else {
348 ACPI_ERROR((AE_INFO, "Unsupported hid [%s]", 348 printk(KERN_ERR PREFIX "Unsupported hid [%s]\n",
349 acpi_device_hid(device))); 349 acpi_device_hid(device));
350 result = -ENODEV; 350 result = -ENODEV;
351 goto end; 351 goto end;
352 } 352 }
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 53625fc3d715..e2fcef4a83df 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -94,7 +94,7 @@ static int acpi_container_add(struct acpi_device *device)
94 ACPI_FUNCTION_TRACE("acpi_container_add"); 94 ACPI_FUNCTION_TRACE("acpi_container_add");
95 95
96 if (!device) { 96 if (!device) {
97 ACPI_ERROR((AE_INFO, "device is NULL")); 97 printk(KERN_ERR PREFIX "device is NULL\n");
98 return_VALUE(-EINVAL); 98 return_VALUE(-EINVAL);
99 } 99 }
100 100
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 94cc8ab94006..0bba8783de55 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1107,7 +1107,7 @@ static int acpi_ec_intr_add(struct acpi_device *device)
1107 acpi_evaluate_integer(ec->common.handle, "_GPE", NULL, 1107 acpi_evaluate_integer(ec->common.handle, "_GPE", NULL,
1108 &ec->common.gpe_bit); 1108 &ec->common.gpe_bit);
1109 if (ACPI_FAILURE(status)) { 1109 if (ACPI_FAILURE(status)) {
1110 ACPI_ERROR((AE_INFO, "Obtaining GPE bit assignment")); 1110 printk(KERN_ERR PREFIX "Obtaining GPE bit assignment\n");
1111 result = -ENODEV; 1111 result = -ENODEV;
1112 goto end; 1112 goto end;
1113 } 1113 }
@@ -1201,7 +1201,7 @@ static int acpi_ec_start(struct acpi_device *device)
1201 acpi_ec_io_ports, ec); 1201 acpi_ec_io_ports, ec);
1202 if (ACPI_FAILURE(status) 1202 if (ACPI_FAILURE(status)
1203 || ec->common.command_addr.register_bit_width == 0) { 1203 || ec->common.command_addr.register_bit_width == 0) {
1204 ACPI_ERROR((AE_INFO, "Error getting I/O port addresses")); 1204 printk(KERN_ERR PREFIX "Error getting I/O port addresses\n");
1205 return_VALUE(-ENODEV); 1205 return_VALUE(-ENODEV);
1206 } 1206 }
1207 1207
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index c1d470557b9f..65bdcde2c4e3 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -203,7 +203,7 @@ static int acpi_fan_add(struct acpi_device *device)
203 203
204 result = acpi_bus_get_power(fan->handle, &state); 204 result = acpi_bus_get_power(fan->handle, &state);
205 if (result) { 205 if (result) {
206 ACPI_ERROR((AE_INFO, "Reading power state")); 206 printk(KERN_ERR PREFIX "Reading power state\n");
207 goto end; 207 goto end;
208 } 208 }
209 209
diff --git a/drivers/acpi/hotkey.c b/drivers/acpi/hotkey.c
index f5da971759ad..393dbbca4e85 100644
--- a/drivers/acpi/hotkey.c
+++ b/drivers/acpi/hotkey.c
@@ -768,7 +768,7 @@ static ssize_t hotkey_write_config(struct file *file,
768 768
769 if (copy_from_user(config_record, buffer, count)) { 769 if (copy_from_user(config_record, buffer, count)) {
770 kfree(config_record); 770 kfree(config_record);
771 ACPI_ERROR((AE_INFO, "Invalid data")); 771 printk(KERN_ERR PREFIX "Invalid data\n");
772 return_VALUE(-EINVAL); 772 return_VALUE(-EINVAL);
773 } 773 }
774 config_record[count] = 0; 774 config_record[count] = 0;
@@ -789,7 +789,7 @@ static ssize_t hotkey_write_config(struct file *file,
789 kfree(bus_method); 789 kfree(bus_method);
790 kfree(action_handle); 790 kfree(action_handle);
791 kfree(method); 791 kfree(method);
792 ACPI_ERROR((AE_INFO, "Invalid data format ret=%d", ret)); 792 printk(KERN_ERR PREFIX "Invalid data format ret=%d\n", ret);
793 return_VALUE(-EINVAL); 793 return_VALUE(-EINVAL);
794 } 794 }
795 795
@@ -802,7 +802,7 @@ static ssize_t hotkey_write_config(struct file *file,
802 tmp = get_hotkey_by_event(&global_hotkey_list, 802 tmp = get_hotkey_by_event(&global_hotkey_list,
803 internal_event_num); 803 internal_event_num);
804 if (!tmp) 804 if (!tmp)
805 ACPI_ERROR((AE_INFO, "Invalid key")); 805 printk(KERN_ERR PREFIX "Invalid key\n");
806 else 806 else
807 memcpy(key, tmp, sizeof(union acpi_hotkey)); 807 memcpy(key, tmp, sizeof(union acpi_hotkey));
808 goto cont_cmd; 808 goto cont_cmd;
@@ -824,7 +824,7 @@ static ssize_t hotkey_write_config(struct file *file,
824 else 824 else
825 free_poll_hotkey_buffer(key); 825 free_poll_hotkey_buffer(key);
826 kfree(key); 826 kfree(key);
827 ACPI_ERROR((AE_INFO, "Invalid hotkey")); 827 printk(KERN_ERR PREFIX "Invalid hotkey\n");
828 return_VALUE(-EINVAL); 828 return_VALUE(-EINVAL);
829 } 829 }
830 830
@@ -858,7 +858,7 @@ static ssize_t hotkey_write_config(struct file *file,
858 else 858 else
859 free_poll_hotkey_buffer(key); 859 free_poll_hotkey_buffer(key);
860 kfree(key); 860 kfree(key);
861 ACPI_ERROR((AE_INFO, "invalid key")); 861 printk(KERN_ERR PREFIX "invalid key\n");
862 return_VALUE(-EINVAL); 862 return_VALUE(-EINVAL);
863} 863}
864 864
@@ -903,7 +903,7 @@ static int read_acpi_int(acpi_handle handle, const char *method,
903 val->integer.value = out_obj.integer.value; 903 val->integer.value = out_obj.integer.value;
904 val->type = out_obj.type; 904 val->type = out_obj.type;
905 } else 905 } else
906 ACPI_ERROR((AE_INFO, "null val pointer")); 906 printk(KERN_ERR PREFIX "null val pointer\n");
907 return_VALUE((status == AE_OK) 907 return_VALUE((status == AE_OK)
908 && (out_obj.type == ACPI_TYPE_INTEGER)); 908 && (out_obj.type == ACPI_TYPE_INTEGER));
909} 909}
@@ -950,14 +950,14 @@ static ssize_t hotkey_execute_aml_method(struct file *file,
950 950
951 if (copy_from_user(arg, buffer, count)) { 951 if (copy_from_user(arg, buffer, count)) {
952 kfree(arg); 952 kfree(arg);
953 ACPI_ERROR((AE_INFO, "Invalid argument 2")); 953 printk(KERN_ERR PREFIX "Invalid argument 2\n");
954 return_VALUE(-EINVAL); 954 return_VALUE(-EINVAL);
955 } 955 }
956 956
957 if (sscanf(arg, "%d:%d:%d:%d", &event, &method_type, &type, &value) != 957 if (sscanf(arg, "%d:%d:%d:%d", &event, &method_type, &type, &value) !=
958 4) { 958 4) {
959 kfree(arg); 959 kfree(arg);
960 ACPI_ERROR((AE_INFO, "Invalid argument 3")); 960 printk(KERN_ERR PREFIX "Invalid argument 3\n");
961 return_VALUE(-EINVAL); 961 return_VALUE(-EINVAL);
962 } 962 }
963 kfree(arg); 963 kfree(arg);
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 2d90b8d2dd73..7d4cc122b026 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -591,7 +591,7 @@ static void acpi_os_execute_deferred(void *context)
591 591
592 dpc = (struct acpi_os_dpc *)context; 592 dpc = (struct acpi_os_dpc *)context;
593 if (!dpc) { 593 if (!dpc) {
594 ACPI_ERROR((AE_INFO, "Invalid (NULL) context")); 594 printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
595 return_VOID; 595 return_VOID;
596 } 596 }
597 597
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 6d3e818e327a..3e7d0191c75c 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -75,9 +75,9 @@ acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id)
75 75
76 result = acpi_bus_get_device(handle, &device); 76 result = acpi_bus_get_device(handle, &device);
77 if (result) { 77 if (result) {
78 ACPI_ERROR((AE_INFO, 78 printk(KERN_ERR PREFIX
79 "Invalid ACPI Bus context for device %s", 79 "Invalid ACPI Bus context for device %s\n",
80 acpi_device_bid(device))); 80 acpi_device_bid(device));
81 return_ACPI_STATUS(AE_NOT_EXIST); 81 return_ACPI_STATUS(AE_NOT_EXIST);
82 } 82 }
83 83
@@ -206,10 +206,10 @@ int acpi_pci_bind(struct acpi_device *device)
206 goto end; 206 goto end;
207 } 207 }
208 if (!data->dev->bus) { 208 if (!data->dev->bus) {
209 ACPI_ERROR((AE_INFO, 209 printk(KERN_ERR PREFIX
210 "Device %02x:%02x:%02x.%02x has invalid 'bus' field", 210 "Device %02x:%02x:%02x.%02x has invalid 'bus' field\n",
211 data->id.segment, data->id.bus, 211 data->id.segment, data->id.bus,
212 data->id.device, data->id.function)); 212 data->id.device, data->id.function);
213 result = -ENODEV; 213 result = -ENODEV;
214 goto end; 214 goto end;
215 } 215 }
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 9010653a3823..f24a610008a0 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -420,7 +420,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
420 pin--; 420 pin--;
421 421
422 if (!dev->bus) { 422 if (!dev->bus) {
423 ACPI_ERROR((AE_INFO, "Invalid (NULL) 'bus' field")); 423 printk(KERN_ERR PREFIX "Invalid (NULL) 'bus' field\n");
424 return_VALUE(-ENODEV); 424 return_VALUE(-ENODEV);
425 } 425 }
426 426
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 6d903bfe5197..d7aa9c10335c 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -161,7 +161,7 @@ acpi_pci_link_check_possible(struct acpi_resource *resource, void *context)
161 break; 161 break;
162 } 162 }
163 default: 163 default:
164 ACPI_ERROR((AE_INFO, "Resource is not an IRQ entry\n")); 164 printk(KERN_ERR PREFIX "Resource is not an IRQ entry\n");
165 return_ACPI_STATUS(AE_OK); 165 return_ACPI_STATUS(AE_OK);
166 } 166 }
167 167
@@ -232,7 +232,7 @@ acpi_pci_link_check_current(struct acpi_resource *resource, void *context)
232 } 232 }
233 break; 233 break;
234 default: 234 default:
235 ACPI_ERROR((AE_INFO, "Resource %d isn't an IRQ", resource->type)); 235 printk(KERN_ERR PREFIX "Resource %d isn't an IRQ\n", resource->type);
236 case ACPI_RESOURCE_TYPE_END_TAG: 236 case ACPI_RESOURCE_TYPE_END_TAG:
237 return_ACPI_STATUS(AE_OK); 237 return_ACPI_STATUS(AE_OK);
238 } 238 }
@@ -264,7 +264,7 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link)
264 /* Query _STA, set link->device->status */ 264 /* Query _STA, set link->device->status */
265 result = acpi_bus_get_status(link->device); 265 result = acpi_bus_get_status(link->device);
266 if (result) { 266 if (result) {
267 ACPI_ERROR((AE_INFO, "Unable to read status")); 267 printk(KERN_ERR PREFIX "Unable to read status\n");
268 goto end; 268 goto end;
269 } 269 }
270 270
@@ -287,7 +287,7 @@ static int acpi_pci_link_get_current(struct acpi_pci_link *link)
287 } 287 }
288 288
289 if (acpi_strict && !irq) { 289 if (acpi_strict && !irq) {
290 ACPI_ERROR((AE_INFO, "_CRS returned 0")); 290 printk(KERN_ERR PREFIX "_CRS returned 0\n");
291 result = -ENODEV; 291 result = -ENODEV;
292 } 292 }
293 293
@@ -357,7 +357,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
357 /* ignore resource_source, it's optional */ 357 /* ignore resource_source, it's optional */
358 break; 358 break;
359 default: 359 default:
360 ACPI_ERROR((AE_INFO, "Invalid Resource_type %d\n", link->irq.resource_type)); 360 printk(KERN_ERR PREFIX "Invalid Resource_type %d\n", link->irq.resource_type);
361 result = -EINVAL; 361 result = -EINVAL;
362 goto end; 362 goto end;
363 363
@@ -377,7 +377,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
377 /* Query _STA, set device->status */ 377 /* Query _STA, set device->status */
378 result = acpi_bus_get_status(link->device); 378 result = acpi_bus_get_status(link->device);
379 if (result) { 379 if (result) {
380 ACPI_ERROR((AE_INFO, "Unable to read status")); 380 printk(KERN_ERR PREFIX "Unable to read status\n");
381 goto end; 381 goto end;
382 } 382 }
383 if (!link->device->status.enabled) { 383 if (!link->device->status.enabled) {
@@ -496,7 +496,7 @@ int __init acpi_irq_penalty_init(void)
496 496
497 link = list_entry(node, struct acpi_pci_link, node); 497 link = list_entry(node, struct acpi_pci_link, node);
498 if (!link) { 498 if (!link) {
499 ACPI_ERROR((AE_INFO, "Invalid link context")); 499 printk(KERN_ERR PREFIX "Invalid link context\n");
500 continue; 500 continue;
501 } 501 }
502 502
@@ -583,10 +583,10 @@ static int acpi_pci_link_allocate(struct acpi_pci_link *link)
583 583
584 /* Attempt to enable the link device at this IRQ. */ 584 /* Attempt to enable the link device at this IRQ. */
585 if (acpi_pci_link_set(link, irq)) { 585 if (acpi_pci_link_set(link, irq)) {
586 ACPI_ERROR((AE_INFO, "Unable to set IRQ for %s [%s]. " 586 printk(KERN_ERR PREFIX "Unable to set IRQ for %s [%s]. "
587 "Try pci=noacpi or acpi=off", 587 "Try pci=noacpi or acpi=off\n",
588 acpi_device_name(link->device), 588 acpi_device_name(link->device),
589 acpi_device_bid(link->device))); 589 acpi_device_bid(link->device));
590 return_VALUE(-ENODEV); 590 return_VALUE(-ENODEV);
591 } else { 591 } else {
592 acpi_irq_penalty[link->irq.active] += PIRQ_PENALTY_PCI_USING; 592 acpi_irq_penalty[link->irq.active] += PIRQ_PENALTY_PCI_USING;
@@ -619,19 +619,19 @@ acpi_pci_link_allocate_irq(acpi_handle handle,
619 619
620 result = acpi_bus_get_device(handle, &device); 620 result = acpi_bus_get_device(handle, &device);
621 if (result) { 621 if (result) {
622 ACPI_ERROR((AE_INFO, "Invalid link device")); 622 printk(KERN_ERR PREFIX "Invalid link device\n");
623 return_VALUE(-1); 623 return_VALUE(-1);
624 } 624 }
625 625
626 link = (struct acpi_pci_link *)acpi_driver_data(device); 626 link = (struct acpi_pci_link *)acpi_driver_data(device);
627 if (!link) { 627 if (!link) {
628 ACPI_ERROR((AE_INFO, "Invalid link context")); 628 printk(KERN_ERR PREFIX "Invalid link context\n");
629 return_VALUE(-1); 629 return_VALUE(-1);
630 } 630 }
631 631
632 /* TBD: Support multiple index (IRQ) entries per Link Device */ 632 /* TBD: Support multiple index (IRQ) entries per Link Device */
633 if (index) { 633 if (index) {
634 ACPI_ERROR((AE_INFO, "Invalid index %d", index)); 634 printk(KERN_ERR PREFIX "Invalid index %d\n", index);
635 return_VALUE(-1); 635 return_VALUE(-1);
636 } 636 }
637 637
@@ -643,7 +643,7 @@ acpi_pci_link_allocate_irq(acpi_handle handle,
643 643
644 if (!link->irq.active) { 644 if (!link->irq.active) {
645 mutex_unlock(&acpi_link_lock); 645 mutex_unlock(&acpi_link_lock);
646 ACPI_ERROR((AE_INFO, "Link active IRQ is 0!")); 646 printk(KERN_ERR PREFIX "Link active IRQ is 0!\n");
647 return_VALUE(-1); 647 return_VALUE(-1);
648 } 648 }
649 link->refcnt++; 649 link->refcnt++;
@@ -675,20 +675,20 @@ int acpi_pci_link_free_irq(acpi_handle handle)
675 675
676 result = acpi_bus_get_device(handle, &device); 676 result = acpi_bus_get_device(handle, &device);
677 if (result) { 677 if (result) {
678 ACPI_ERROR((AE_INFO, "Invalid link device")); 678 printk(KERN_ERR PREFIX "Invalid link device\n");
679 return_VALUE(-1); 679 return_VALUE(-1);
680 } 680 }
681 681
682 link = (struct acpi_pci_link *)acpi_driver_data(device); 682 link = (struct acpi_pci_link *)acpi_driver_data(device);
683 if (!link) { 683 if (!link) {
684 ACPI_ERROR((AE_INFO, "Invalid link context")); 684 printk(KERN_ERR PREFIX "Invalid link context\n");
685 return_VALUE(-1); 685 return_VALUE(-1);
686 } 686 }
687 687
688 mutex_lock(&acpi_link_lock); 688 mutex_lock(&acpi_link_lock);
689 if (!link->irq.initialized) { 689 if (!link->irq.initialized) {
690 mutex_unlock(&acpi_link_lock); 690 mutex_unlock(&acpi_link_lock);
691 ACPI_ERROR((AE_INFO, "Link isn't initialized")); 691 printk(KERN_ERR PREFIX "Link isn't initialized\n");
692 return_VALUE(-1); 692 return_VALUE(-1);
693 } 693 }
694#ifdef FUTURE_USE 694#ifdef FUTURE_USE
@@ -813,7 +813,7 @@ static int irqrouter_resume(struct sys_device *dev)
813 list_for_each(node, &acpi_link.entries) { 813 list_for_each(node, &acpi_link.entries) {
814 link = list_entry(node, struct acpi_pci_link, node); 814 link = list_entry(node, struct acpi_pci_link, node);
815 if (!link) { 815 if (!link) {
816 ACPI_ERROR((AE_INFO, "Invalid link context")); 816 printk(KERN_ERR PREFIX "Invalid link context\n");
817 continue; 817 continue;
818 } 818 }
819 acpi_pci_link_resume(link); 819 acpi_pci_link_resume(link);
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 0f661dd42d41..1930397e3c52 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -231,9 +231,9 @@ static int acpi_pci_root_add(struct acpi_device *device)
231 int bus = 0; 231 int bus = 0;
232 acpi_status status; 232 acpi_status status;
233 233
234 ACPI_ERROR((AE_INFO, 234 printk(KERN_ERR PREFIX
235 "Wrong _BBN value, reboot" 235 "Wrong _BBN value, reboot"
236 " and use option 'pci=noacpi'")); 236 " and use option 'pci=noacpi'\n");
237 237
238 status = try_get_root_bridge_busnr(root->handle, &bus); 238 status = try_get_root_bridge_busnr(root->handle, &bus);
239 if (ACPI_FAILURE(status)) 239 if (ACPI_FAILURE(status))
@@ -274,9 +274,9 @@ static int acpi_pci_root_add(struct acpi_device *device)
274 */ 274 */
275 root->bus = pci_acpi_scan_root(device, root->id.segment, root->id.bus); 275 root->bus = pci_acpi_scan_root(device, root->id.segment, root->id.bus);
276 if (!root->bus) { 276 if (!root->bus) {
277 ACPI_ERROR((AE_INFO, 277 printk(KERN_ERR PREFIX
278 "Bus %04x:%02x not present in PCI namespace", 278 "Bus %04x:%02x not present in PCI namespace\n",
279 root->id.segment, root->id.bus)); 279 root->id.segment, root->id.bus);
280 result = -ENODEV; 280 result = -ENODEV;
281 goto end; 281 goto end;
282 } 282 }
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 43688c8280e5..efc4bb751286 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -291,7 +291,7 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev)
291 for (i = 0; i < dev->wakeup.resources.count; i++) { 291 for (i = 0; i < dev->wakeup.resources.count; i++) {
292 ret = acpi_power_on(dev->wakeup.resources.handles[i]); 292 ret = acpi_power_on(dev->wakeup.resources.handles[i]);
293 if (ret) { 293 if (ret) {
294 ACPI_ERROR((AE_INFO, "Transition power state")); 294 printk(KERN_ERR PREFIX "Transition power state\n");
295 dev->wakeup.flags.valid = 0; 295 dev->wakeup.flags.valid = 0;
296 return_VALUE(-1); 296 return_VALUE(-1);
297 } 297 }
@@ -300,7 +300,7 @@ int acpi_enable_wakeup_device_power(struct acpi_device *dev)
300 /* Execute PSW */ 300 /* Execute PSW */
301 status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL); 301 status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL);
302 if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { 302 if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
303 ACPI_ERROR((AE_INFO, "Evaluate _PSW")); 303 printk(KERN_ERR PREFIX "Evaluate _PSW\n");
304 dev->wakeup.flags.valid = 0; 304 dev->wakeup.flags.valid = 0;
305 ret = -1; 305 ret = -1;
306 } 306 }
@@ -330,7 +330,7 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev)
330 /* Execute PSW */ 330 /* Execute PSW */
331 status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL); 331 status = acpi_evaluate_object(dev->handle, "_PSW", &arg_list, NULL);
332 if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) { 332 if (ACPI_FAILURE(status) && (status != AE_NOT_FOUND)) {
333 ACPI_ERROR((AE_INFO, "Evaluate _PSW")); 333 printk(KERN_ERR PREFIX "Evaluate _PSW\n");
334 dev->wakeup.flags.valid = 0; 334 dev->wakeup.flags.valid = 0;
335 return_VALUE(-1); 335 return_VALUE(-1);
336 } 336 }
@@ -339,7 +339,7 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev)
339 for (i = 0; i < dev->wakeup.resources.count; i++) { 339 for (i = 0; i < dev->wakeup.resources.count; i++) {
340 ret = acpi_power_off_device(dev->wakeup.resources.handles[i]); 340 ret = acpi_power_off_device(dev->wakeup.resources.handles[i]);
341 if (ret) { 341 if (ret) {
342 ACPI_ERROR((AE_INFO, "Transition power state")); 342 printk(KERN_ERR PREFIX "Transition power state\n");
343 dev->wakeup.flags.valid = 0; 343 dev->wakeup.flags.valid = 0;
344 return_VALUE(-1); 344 return_VALUE(-1);
345 } 345 }
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 2bbdf8a7a304..80bbf187a37d 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -453,7 +453,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
453 */ 453 */
454 status = acpi_evaluate_object(pr->handle, NULL, NULL, &buffer); 454 status = acpi_evaluate_object(pr->handle, NULL, NULL, &buffer);
455 if (ACPI_FAILURE(status)) { 455 if (ACPI_FAILURE(status)) {
456 ACPI_ERROR((AE_INFO, "Evaluating processor object")); 456 printk(KERN_ERR PREFIX "Evaluating processor object\n");
457 return_VALUE(-ENODEV); 457 return_VALUE(-ENODEV);
458 } 458 }
459 459
@@ -483,9 +483,9 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
483 if (cpu_index == -1) { 483 if (cpu_index == -1) {
484 if (ACPI_FAILURE 484 if (ACPI_FAILURE
485 (acpi_processor_hotadd_init(pr->handle, &pr->id))) { 485 (acpi_processor_hotadd_init(pr->handle, &pr->id))) {
486 ACPI_ERROR((AE_INFO, 486 printk(KERN_ERR PREFIX
487 "Getting cpuindex for acpiid 0x%x", 487 "Getting cpuindex for acpiid 0x%x\n",
488 pr->acpi_id)); 488 pr->acpi_id);
489 return_VALUE(-ENODEV); 489 return_VALUE(-ENODEV);
490 } 490 }
491 } 491 }
@@ -496,8 +496,8 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
496 if (!object.processor.pblk_address) 496 if (!object.processor.pblk_address)
497 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No PBLK (NULL address)\n")); 497 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No PBLK (NULL address)\n"));
498 else if (object.processor.pblk_length != 6) 498 else if (object.processor.pblk_length != 6)
499 ACPI_ERROR((AE_INFO, "Invalid PBLK length [%d]", 499 printk(KERN_ERR PREFIX "Invalid PBLK length [%d]\n",
500 object.processor.pblk_length)); 500 object.processor.pblk_length);
501 else { 501 else {
502 pr->throttling.address = object.processor.pblk_address; 502 pr->throttling.address = object.processor.pblk_address;
503 pr->throttling.duty_offset = acpi_fadt.duty_offset; 503 pr->throttling.duty_offset = acpi_fadt.duty_offset;
@@ -751,14 +751,14 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
751 if (acpi_bus_get_device(handle, &device)) { 751 if (acpi_bus_get_device(handle, &device)) {
752 result = acpi_processor_device_add(handle, &device); 752 result = acpi_processor_device_add(handle, &device);
753 if (result) 753 if (result)
754 ACPI_ERROR((AE_INFO, 754 printk(KERN_ERR PREFIX
755 "Unable to add the device")); 755 "Unable to add the device\n");
756 break; 756 break;
757 } 757 }
758 758
759 pr = acpi_driver_data(device); 759 pr = acpi_driver_data(device);
760 if (!pr) { 760 if (!pr) {
761 ACPI_ERROR((AE_INFO, "Driver data is NULL")); 761 printk(KERN_ERR PREFIX "Driver data is NULL\n");
762 break; 762 break;
763 } 763 }
764 764
@@ -771,8 +771,8 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
771 if ((!result) && ((pr->id >= 0) && (pr->id < NR_CPUS))) { 771 if ((!result) && ((pr->id >= 0) && (pr->id < NR_CPUS))) {
772 kobject_uevent(&device->kobj, KOBJ_ONLINE); 772 kobject_uevent(&device->kobj, KOBJ_ONLINE);
773 } else { 773 } else {
774 ACPI_ERROR((AE_INFO, "Device [%s] failed to start", 774 printk(KERN_ERR PREFIX "Device [%s] failed to start\n",
775 acpi_device_bid(device))); 775 acpi_device_bid(device));
776 } 776 }
777 break; 777 break;
778 case ACPI_NOTIFY_EJECT_REQUEST: 778 case ACPI_NOTIFY_EJECT_REQUEST:
@@ -780,14 +780,14 @@ acpi_processor_hotplug_notify(acpi_handle handle, u32 event, void *data)
780 "received ACPI_NOTIFY_EJECT_REQUEST\n")); 780 "received ACPI_NOTIFY_EJECT_REQUEST\n"));
781 781
782 if (acpi_bus_get_device(handle, &device)) { 782 if (acpi_bus_get_device(handle, &device)) {
783 ACPI_ERROR((AE_INFO, 783 printk(KERN_ERR PREFIX
784 "Device don't exist, dropping EJECT")); 784 "Device don't exist, dropping EJECT\n");
785 break; 785 break;
786 } 786 }
787 pr = acpi_driver_data(device); 787 pr = acpi_driver_data(device);
788 if (!pr) { 788 if (!pr) {
789 ACPI_ERROR((AE_INFO, 789 printk(KERN_ERR PREFIX
790 "Driver data is NULL, dropping EJECT")); 790 "Driver data is NULL, dropping EJECT\n");
791 return_VOID; 791 return_VOID;
792 } 792 }
793 793
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 52ada5322447..786851da85c6 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -674,7 +674,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
674 674
675 /* There must be at least 2 elements */ 675 /* There must be at least 2 elements */
676 if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) { 676 if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) {
677 ACPI_ERROR((AE_INFO, "not enough elements in _CST")); 677 printk(KERN_ERR PREFIX "not enough elements in _CST\n");
678 status = -EFAULT; 678 status = -EFAULT;
679 goto end; 679 goto end;
680 } 680 }
@@ -683,7 +683,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
683 683
684 /* Validate number of power states. */ 684 /* Validate number of power states. */
685 if (count < 1 || count != cst->package.count - 1) { 685 if (count < 1 || count != cst->package.count - 1) {
686 ACPI_ERROR((AE_INFO, "count given by _CST is not valid")); 686 printk(KERN_ERR PREFIX "count given by _CST is not valid\n");
687 status = -EFAULT; 687 status = -EFAULT;
688 goto end; 688 goto end;
689 } 689 }
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index a79b6ef8122a..8bd7500c6121 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -179,7 +179,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)
179 pct = (union acpi_object *)buffer.pointer; 179 pct = (union acpi_object *)buffer.pointer;
180 if (!pct || (pct->type != ACPI_TYPE_PACKAGE) 180 if (!pct || (pct->type != ACPI_TYPE_PACKAGE)
181 || (pct->package.count != 2)) { 181 || (pct->package.count != 2)) {
182 ACPI_ERROR((AE_INFO, "Invalid _PCT data")); 182 printk(KERN_ERR PREFIX "Invalid _PCT data\n");
183 result = -EFAULT; 183 result = -EFAULT;
184 goto end; 184 goto end;
185 } 185 }
@@ -193,7 +193,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)
193 if ((obj.type != ACPI_TYPE_BUFFER) 193 if ((obj.type != ACPI_TYPE_BUFFER)
194 || (obj.buffer.length < sizeof(struct acpi_pct_register)) 194 || (obj.buffer.length < sizeof(struct acpi_pct_register))
195 || (obj.buffer.pointer == NULL)) { 195 || (obj.buffer.pointer == NULL)) {
196 ACPI_ERROR((AE_INFO, "Invalid _PCT data (control_register)")); 196 printk(KERN_ERR PREFIX "Invalid _PCT data (control_register)\n");
197 result = -EFAULT; 197 result = -EFAULT;
198 goto end; 198 goto end;
199 } 199 }
@@ -209,7 +209,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)
209 if ((obj.type != ACPI_TYPE_BUFFER) 209 if ((obj.type != ACPI_TYPE_BUFFER)
210 || (obj.buffer.length < sizeof(struct acpi_pct_register)) 210 || (obj.buffer.length < sizeof(struct acpi_pct_register))
211 || (obj.buffer.pointer == NULL)) { 211 || (obj.buffer.pointer == NULL)) {
212 ACPI_ERROR((AE_INFO, "Invalid _PCT data (status_register)")); 212 printk(KERN_ERR PREFIX "Invalid _PCT data (status_register)\n");
213 result = -EFAULT; 213 result = -EFAULT;
214 goto end; 214 goto end;
215 } 215 }
@@ -243,7 +243,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
243 243
244 pss = (union acpi_object *)buffer.pointer; 244 pss = (union acpi_object *)buffer.pointer;
245 if (!pss || (pss->type != ACPI_TYPE_PACKAGE)) { 245 if (!pss || (pss->type != ACPI_TYPE_PACKAGE)) {
246 ACPI_ERROR((AE_INFO, "Invalid _PSS data")); 246 printk(KERN_ERR PREFIX "Invalid _PSS data\n");
247 result = -EFAULT; 247 result = -EFAULT;
248 goto end; 248 goto end;
249 } 249 }
@@ -288,8 +288,8 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
288 (u32) px->control, (u32) px->status)); 288 (u32) px->control, (u32) px->status));
289 289
290 if (!px->core_frequency) { 290 if (!px->core_frequency) {
291 ACPI_ERROR((AE_INFO, 291 printk(KERN_ERR PREFIX
292 "Invalid _PSS data: freq is zero")); 292 "Invalid _PSS data: freq is zero\n");
293 result = -EFAULT; 293 result = -EFAULT;
294 kfree(pr->performance->states); 294 kfree(pr->performance->states);
295 goto end; 295 goto end;
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index c2095ab7f0dd..0f86d0253c60 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -82,7 +82,7 @@ static int acpi_processor_apply_limit(struct acpi_processor *pr)
82 82
83 end: 83 end:
84 if (result) 84 if (result)
85 ACPI_ERROR((AE_INFO, "Unable to set limit")); 85 printk(KERN_ERR PREFIX "Unable to set limit\n");
86 86
87 return_VALUE(result); 87 return_VALUE(result);
88} 88}
@@ -289,7 +289,7 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type)
289 289
290 result = acpi_processor_apply_limit(pr); 290 result = acpi_processor_apply_limit(pr);
291 if (result) 291 if (result)
292 ACPI_ERROR((AE_INFO, "Unable to set thermal limit")); 292 printk(KERN_ERR PREFIX "Unable to set thermal limit\n");
293 293
294 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Thermal limit now (P%d:T%d)\n", 294 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Thermal limit now (P%d:T%d)\n",
295 pr->limit.thermal.px, pr->limit.thermal.tx)); 295 pr->limit.thermal.px, pr->limit.thermal.tx));
@@ -371,13 +371,13 @@ static ssize_t acpi_processor_write_limit(struct file * file,
371 limit_string[count] = '\0'; 371 limit_string[count] = '\0';
372 372
373 if (sscanf(limit_string, "%d:%d", &px, &tx) != 2) { 373 if (sscanf(limit_string, "%d:%d", &px, &tx) != 2) {
374 ACPI_ERROR((AE_INFO, "Invalid data format")); 374 printk(KERN_ERR PREFIX "Invalid data format\n");
375 return_VALUE(-EINVAL); 375 return_VALUE(-EINVAL);
376 } 376 }
377 377
378 if (pr->flags.throttling) { 378 if (pr->flags.throttling) {
379 if ((tx < 0) || (tx > (pr->throttling.state_count - 1))) { 379 if ((tx < 0) || (tx > (pr->throttling.state_count - 1))) {
380 ACPI_ERROR((AE_INFO, "Invalid tx")); 380 printk(KERN_ERR PREFIX "Invalid tx\n");
381 return_VALUE(-EINVAL); 381 return_VALUE(-EINVAL);
382 } 382 }
383 pr->limit.user.tx = tx; 383 pr->limit.user.tx = tx;
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 964ee5c8ea16..18c8e3e2fbad 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -969,7 +969,7 @@ acpi_add_single_object(struct acpi_device **child,
969 969
970 device = kmalloc(sizeof(struct acpi_device), GFP_KERNEL); 970 device = kmalloc(sizeof(struct acpi_device), GFP_KERNEL);
971 if (!device) { 971 if (!device) {
972 ACPI_ERROR((AE_INFO, "Memory allocation error")); 972 printk(KERN_ERR PREFIX "Memory allocation error\n");
973 return_VALUE(-ENOMEM); 973 return_VALUE(-ENOMEM);
974 } 974 }
975 memset(device, 0, sizeof(struct acpi_device)); 975 memset(device, 0, sizeof(struct acpi_device));
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 6e9157a1d92d..1b9754919f72 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -698,7 +698,7 @@ static void acpi_thermal_check(void *data)
698 ACPI_FUNCTION_TRACE("acpi_thermal_check"); 698 ACPI_FUNCTION_TRACE("acpi_thermal_check");
699 699
700 if (!tz) { 700 if (!tz) {
701 ACPI_ERROR((AE_INFO, "Invalid (NULL) context")); 701 printk(KERN_ERR PREFIX "Invalid (NULL) context\n");
702 return_VOID; 702 return_VOID;
703 } 703 }
704 704
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index dcb497537c14..33268310c738 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -950,7 +950,6 @@ acpi_ut_error(char *module_name, u32 line_number, char *format, ...)
950 acpi_os_vprintf(format, args); 950 acpi_os_vprintf(format, args);
951 acpi_os_printf(" [%X]\n", ACPI_CA_VERSION); 951 acpi_os_printf(" [%X]\n", ACPI_CA_VERSION);
952} 952}
953EXPORT_SYMBOL(acpi_ut_error);
954 953
955void ACPI_INTERNAL_VAR_XFACE 954void ACPI_INTERNAL_VAR_XFACE
956acpi_ut_exception(char *module_name, 955acpi_ut_exception(char *module_name,
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 040ff473d1f2..a5da4efab063 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -326,7 +326,7 @@ acpi_evaluate_string(acpi_handle handle,
326 326
327 *data = kmalloc(element->string.length + 1, GFP_KERNEL); 327 *data = kmalloc(element->string.length + 1, GFP_KERNEL);
328 if (!data) { 328 if (!data) {
329 ACPI_ERROR((AE_INFO, "Memory allocation")); 329 printk(KERN_ERR PREFIX "Memory allocation\n");
330 return_VALUE(-ENOMEM); 330 return_VALUE(-ENOMEM);
331 } 331 }
332 memset(*data, 0, element->string.length + 1); 332 memset(*data, 0, element->string.length + 1);
@@ -368,22 +368,22 @@ acpi_evaluate_reference(acpi_handle handle,
368 package = (union acpi_object *)buffer.pointer; 368 package = (union acpi_object *)buffer.pointer;
369 369
370 if ((buffer.length == 0) || !package) { 370 if ((buffer.length == 0) || !package) {
371 ACPI_ERROR((AE_INFO, "No return object (len %X ptr %p)", 371 printk(KERN_ERR PREFIX "No return object (len %X ptr %p)\n",
372 (unsigned)buffer.length, package)); 372 (unsigned)buffer.length, package);
373 status = AE_BAD_DATA; 373 status = AE_BAD_DATA;
374 acpi_util_eval_error(handle, pathname, status); 374 acpi_util_eval_error(handle, pathname, status);
375 goto end; 375 goto end;
376 } 376 }
377 if (package->type != ACPI_TYPE_PACKAGE) { 377 if (package->type != ACPI_TYPE_PACKAGE) {
378 ACPI_ERROR((AE_INFO, "Expecting a [Package], found type %X", 378 printk(KERN_ERR PREFIX "Expecting a [Package], found type %X\n",
379 package->type)); 379 package->type);
380 status = AE_BAD_DATA; 380 status = AE_BAD_DATA;
381 acpi_util_eval_error(handle, pathname, status); 381 acpi_util_eval_error(handle, pathname, status);
382 goto end; 382 goto end;
383 } 383 }
384 if (!package->package.count) { 384 if (!package->package.count) {
385 ACPI_ERROR((AE_INFO, "[Package] has zero elements (%p)", 385 printk(KERN_ERR PREFIX "[Package] has zero elements (%p)\n",
386 package)); 386 package);
387 status = AE_BAD_DATA; 387 status = AE_BAD_DATA;
388 acpi_util_eval_error(handle, pathname, status); 388 acpi_util_eval_error(handle, pathname, status);
389 goto end; 389 goto end;
@@ -402,9 +402,9 @@ acpi_evaluate_reference(acpi_handle handle,
402 402
403 if (element->type != ACPI_TYPE_ANY) { 403 if (element->type != ACPI_TYPE_ANY) {
404 status = AE_BAD_DATA; 404 status = AE_BAD_DATA;
405 ACPI_ERROR((AE_INFO, 405 printk(KERN_ERR PREFIX
406 "Expecting a [Reference] package element, found type %X", 406 "Expecting a [Reference] package element, found type %X\n",
407 element->type)); 407 element->type);
408 acpi_util_eval_error(handle, pathname, status); 408 acpi_util_eval_error(handle, pathname, status);
409 break; 409 break;
410 } 410 }
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 7854a4a9572b..ca37da537bd6 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -324,7 +324,7 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device,
324 return_VALUE(status); 324 return_VALUE(status);
325 obj = (union acpi_object *)buffer.pointer; 325 obj = (union acpi_object *)buffer.pointer;
326 if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) { 326 if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {
327 ACPI_ERROR((AE_INFO, "Invalid _BCL data")); 327 printk(KERN_ERR PREFIX "Invalid _BCL data\n");
328 status = -EFAULT; 328 status = -EFAULT;
329 goto err; 329 goto err;
330 } 330 }
@@ -399,7 +399,7 @@ acpi_video_device_EDID(struct acpi_video_device *device,
399 if (obj && obj->type == ACPI_TYPE_BUFFER) 399 if (obj && obj->type == ACPI_TYPE_BUFFER)
400 *edid = obj; 400 *edid = obj;
401 else { 401 else {
402 ACPI_ERROR((AE_INFO, "Invalid _DDC data")); 402 printk(KERN_ERR PREFIX "Invalid _DDC data\n");
403 status = -EFAULT; 403 status = -EFAULT;
404 kfree(obj); 404 kfree(obj);
405 } 405 }
@@ -560,7 +560,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
560 o = (union acpi_object *)&obj->package. 560 o = (union acpi_object *)&obj->package.
561 elements[i]; 561 elements[i];
562 if (o->type != ACPI_TYPE_INTEGER) { 562 if (o->type != ACPI_TYPE_INTEGER) {
563 ACPI_ERROR((AE_INFO, "Invalid data")); 563 printk(KERN_ERR PREFIX "Invalid data\n");
564 continue; 564 continue;
565 } 565 }
566 br->levels[count] = (u32) o->integer.value; 566 br->levels[count] = (u32) o->integer.value;
@@ -1466,7 +1466,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
1466 obj = (union acpi_object *)&dod->package.elements[i]; 1466 obj = (union acpi_object *)&dod->package.elements[i];
1467 1467
1468 if (obj->type != ACPI_TYPE_INTEGER) { 1468 if (obj->type != ACPI_TYPE_INTEGER) {
1469 ACPI_ERROR((AE_INFO, "Invalid _DOD data")); 1469 printk(KERN_ERR PREFIX "Invalid _DOD data\n");
1470 active_device_list[i].value.int_val = 1470 active_device_list[i].value.int_val =
1471 ACPI_VIDEO_HEAD_INVALID; 1471 ACPI_VIDEO_HEAD_INVALID;
1472 } 1472 }
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-24 08:27:22 -0500