aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 d9d531cce27f..78a82b3c7b60 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -59,7 +59,7 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
59 count = snprintf(&modalias[len], size, "%s:", 59 count = snprintf(&modalias[len], size, "%s:",
60 cid_list->id[i].value); 60 cid_list->id[i].value);
61 if (count < 0 || count >= size) { 61 if (count < 0 || count >= size) {
62 printk(KERN_ERR "acpi: %s cid[%i] exceeds event buffer size", 62 printk(KERN_ERR PREFIX "%s cid[%i] exceeds event buffer size",
63 acpi_dev->pnp.device_name, i); 63 acpi_dev->pnp.device_name, i);
64 break; 64 break;
65 } 65 }
@@ -453,7 +453,7 @@ static int acpi_device_register(struct acpi_device *device,
453 device->dev.release = &acpi_device_release; 453 device->dev.release = &acpi_device_release;
454 result = device_add(&device->dev); 454 result = device_add(&device->dev);
455 if(result) { 455 if(result) {
456 printk("Error adding device %s", device->dev.bus_id); 456 printk(KERN_ERR PREFIX "Error adding device %s", device->dev.bus_id);
457 goto end; 457 goto end;
458 } 458 }
459 459
@@ -956,7 +956,7 @@ static void acpi_device_set_id(struct acpi_device *device,
956 case ACPI_BUS_TYPE_DEVICE: 956 case ACPI_BUS_TYPE_DEVICE:
957 status = acpi_get_object_info(handle, &buffer); 957 status = acpi_get_object_info(handle, &buffer);
958 if (ACPI_FAILURE(status)) { 958 if (ACPI_FAILURE(status)) {
959 printk("%s: Error reading device info\n", __FUNCTION__); 959 printk(KERN_ERR PREFIX "%s: Error reading device info\n", __FUNCTION__);
960 return; 960 return;
961 } 961 }
962 962
@@ -1026,7 +1026,7 @@ static void acpi_device_set_id(struct acpi_device *device,
1026 if (device->pnp.cid_list) 1026 if (device->pnp.cid_list)
1027 memcpy(device->pnp.cid_list, cid_list, cid_list->size); 1027 memcpy(device->pnp.cid_list, cid_list, cid_list->size);
1028 else 1028 else
1029 printk(KERN_ERR "Memory allocation error\n"); 1029 printk(KERN_ERR PREFIX "Memory allocation error\n");
1030 } 1030 }
1031 1031
1032 kfree(buffer.pointer); 1032 kfree(buffer.pointer);
@@ -1050,7 +1050,7 @@ static int acpi_device_set_context(struct acpi_device *device, int type)
1050 acpi_bus_data_handler, device); 1050 acpi_bus_data_handler, device);
1051 1051
1052 if (ACPI_FAILURE(status)) { 1052 if (ACPI_FAILURE(status)) {
1053 printk("Error attaching device data\n"); 1053 printk(KERN_ERR PREFIX "Error attaching device data\n");
1054 result = -ENODEV; 1054 result = -ENODEV;
1055 } 1055 }
1056 } 1056 }