aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2008-09-28 02:51:56 -0400
committerLen Brown <len.brown@intel.com>2008-10-22 23:14:41 -0400
commit55ac9a018f83e4f42f3c6ce98a8dbda73b985935 (patch)
treebb8b1121c247fe6018164ee726aa0395f0dbb073 /drivers/acpi/scan.c
parent8bd108d14604d9c95000751e6c6ecbd11ea6ed40 (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/scan.c')
-rw-r--r--drivers/acpi/scan.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index f6f52c1a2aba..81d6095468f9 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -113,16 +113,16 @@ static int acpi_bus_hot_remove_device(void *context)
113 113
114 114
115 if (acpi_bus_trim(device, 1)) { 115 if (acpi_bus_trim(device, 1)) {
116 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, 116 printk(KERN_ERR PREFIX
117 "Removing device failed\n")); 117 "Removing device failed\n");
118 return -1; 118 return -1;
119 } 119 }
120 120
121 /* power off device */ 121 /* power off device */
122 status = acpi_evaluate_object(handle, "_PS3", NULL, NULL); 122 status = acpi_evaluate_object(handle, "_PS3", NULL, NULL);
123 if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) 123 if (ACPI_FAILURE(status) && status != AE_NOT_FOUND)
124 ACPI_DEBUG_PRINT((ACPI_DB_WARN, 124 printk(KERN_WARNING PREFIX
125 "Power-off device failed\n")); 125 "Power-off device failed\n");
126 126
127 if (device->flags.lockable) { 127 if (device->flags.lockable) {
128 arg_list.count = 1; 128 arg_list.count = 1;
@@ -477,7 +477,7 @@ static int acpi_device_register(struct acpi_device *device,
477 477
478 result = acpi_device_setup_files(device); 478 result = acpi_device_setup_files(device);
479 if(result) 479 if(result)
480 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error creating sysfs interface for device %s\n", device->dev.bus_id)); 480 printk(KERN_ERR PREFIX "Error creating sysfs interface for device %s\n", device->dev.bus_id);
481 481
482 device->removal_type = ACPI_BUS_REMOVAL_NORMAL; 482 device->removal_type = ACPI_BUS_REMOVAL_NORMAL;
483 return 0; 483 return 0;