diff options
author | Lin Ming <ming.m.lin@intel.com> | 2008-09-28 02:51:56 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:14:41 -0400 |
commit | 55ac9a018f83e4f42f3c6ce98a8dbda73b985935 (patch) | |
tree | bb8b1121c247fe6018164ee726aa0395f0dbb073 /drivers/acpi/video.c | |
parent | 8bd108d14604d9c95000751e6c6ecbd11ea6ed40 (diff) |
ACPI: replace ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ...) with printk
ACPI_DB_ERROR and ACPI_DB_WARN were removed from ACPICA core.
So replace ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ...) with printk(KERN_ERR PREFIX ...)
and ACPI_DEBUG_PRINT((ACPI_DB_WARN, ...) with printk(KERN_WARNING PREFIX ...)
We do not use ACPI_ERROR/ACPI_WARNING since they're not exported, see
-------------------------------------------------------------
commit 6468463abd7051fcc29f3ee7c931f9bbbb26f5a4
Author: Len Brown <len.brown@intel.com>
Date: Mon Jun 26 23:41:38 2006 -0400
ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)
Signed-off-by: Len Brown <len.brown@intel.com>
-------------------------------------------------------------
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/video.c')
-rw-r--r-- | drivers/acpi/video.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index e8a51a1700f7..4ae39ee8cdef 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -1530,8 +1530,8 @@ acpi_video_bus_get_one_device(struct acpi_device *device, | |||
1530 | acpi_video_device_notify, | 1530 | acpi_video_device_notify, |
1531 | data); | 1531 | data); |
1532 | if (ACPI_FAILURE(status)) { | 1532 | if (ACPI_FAILURE(status)) { |
1533 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 1533 | printk(KERN_ERR PREFIX |
1534 | "Error installing notify handler\n")); | 1534 | "Error installing notify handler\n"); |
1535 | if(data->brightness) | 1535 | if(data->brightness) |
1536 | kfree(data->brightness->levels); | 1536 | kfree(data->brightness->levels); |
1537 | kfree(data->brightness); | 1537 | kfree(data->brightness); |
@@ -1745,8 +1745,8 @@ acpi_video_bus_get_devices(struct acpi_video_bus *video, | |||
1745 | 1745 | ||
1746 | status = acpi_video_bus_get_one_device(dev, video); | 1746 | status = acpi_video_bus_get_one_device(dev, video); |
1747 | if (ACPI_FAILURE(status)) { | 1747 | if (ACPI_FAILURE(status)) { |
1748 | ACPI_DEBUG_PRINT((ACPI_DB_WARN, | 1748 | printk(KERN_WARNING PREFIX |
1749 | "Cant attach device")); | 1749 | "Cant attach device"); |
1750 | continue; | 1750 | continue; |
1751 | } | 1751 | } |
1752 | } | 1752 | } |
@@ -2003,8 +2003,8 @@ static int acpi_video_bus_add(struct acpi_device *device) | |||
2003 | ACPI_DEVICE_NOTIFY, | 2003 | ACPI_DEVICE_NOTIFY, |
2004 | acpi_video_bus_notify, video); | 2004 | acpi_video_bus_notify, video); |
2005 | if (ACPI_FAILURE(status)) { | 2005 | if (ACPI_FAILURE(status)) { |
2006 | ACPI_DEBUG_PRINT((ACPI_DB_ERROR, | 2006 | printk(KERN_ERR PREFIX |
2007 | "Error installing notify handler\n")); | 2007 | "Error installing notify handler\n"); |
2008 | error = -ENODEV; | 2008 | error = -ENODEV; |
2009 | goto err_stop_video; | 2009 | goto err_stop_video; |
2010 | } | 2010 | } |