diff options
author | Len Brown <len.brown@intel.com> | 2006-06-26 23:41:38 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-27 00:01:06 -0400 |
commit | 6468463abd7051fcc29f3ee7c931f9bbbb26f5a4 (patch) | |
tree | d18eae04fe6c8f7d257077cc6056cd9c6f424e0d /drivers/acpi/acpi_memhotplug.c | |
parent | cece92969762b8ed7930d4e23008b76b06411dee (diff) |
ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
-rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 18 |
1 files changed, 9 insertions, 9 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 | */ |