aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/video.c
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/acpi/video.c
parentcece92969762b8ed7930d4e23008b76b06411dee (diff)
ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/video.c')
-rw-r--r--drivers/acpi/video.c8
1 files changed, 4 insertions, 4 deletions
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 }