aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
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 c7b0aa52dd23..3fac011f9cf9 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
@@ -966,7 +966,7 @@ static void acpi_device_set_id(struct acpi_device *device,
966 case ACPI_BUS_TYPE_DEVICE: 966 case ACPI_BUS_TYPE_DEVICE:
967 status = acpi_get_object_info(handle, &buffer); 967 status = acpi_get_object_info(handle, &buffer);
968 if (ACPI_FAILURE(status)) { 968 if (ACPI_FAILURE(status)) {
969 printk("%s: Error reading device info\n", __FUNCTION__); 969 printk(KERN_ERR PREFIX "%s: Error reading device info\n", __FUNCTION__);
970 return; 970 return;
971 } 971 }
972 972
@@ -1072,7 +1072,7 @@ static void acpi_device_set_id(struct acpi_device *device,
1072 list->count = count; 1072 list->count = count;
1073 device->pnp.cid_list = list; 1073 device->pnp.cid_list = list;
1074 } else 1074 } else
1075 printk(KERN_ERR "Memory allocation error\n"); 1075 printk(KERN_ERR PREFIX "Memory allocation error\n");
1076 } 1076 }
1077 1077
1078 kfree(buffer.pointer); 1078 kfree(buffer.pointer);
@@ -1096,7 +1096,7 @@ static int acpi_device_set_context(struct acpi_device *device, int type)
1096 acpi_bus_data_handler, device); 1096 acpi_bus_data_handler, device);
1097 1097
1098 if (ACPI_FAILURE(status)) { 1098 if (ACPI_FAILURE(status)) {
1099 printk("Error attaching device data\n"); 1099 printk(KERN_ERR PREFIX "Error attaching device data\n");
1100 result = -ENODEV; 1100 result = -ENODEV;
1101 } 1101 }
1102 } 1102 }