6 files changed, 14 insertions, 18 deletions

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 55c17afbe669..2655bc1b4eeb 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -263,22 +263,22 @@ static int acpi_fan_add(struct acpi_device *device)
                 goto end;
         }
 
-        printk(KERN_INFO PREFIX
-                "%s is registered as cooling_device%d\n",
-                device->dev.bus_id, cdev->id);
+        dev_info(&device->dev, "registered as cooling_device%d\n", cdev->id);
 
         acpi_driver_data(device) = cdev;
         result = sysfs_create_link(&device->dev.kobj,
                                    &cdev->device.kobj,
                                    "thermal_cooling");
         if (result)
-                printk(KERN_ERR PREFIX "Create sysfs link\n");
+                dev_err(&device->dev, "Failed to create sysfs link "
+                        "'thermal_cooling'\n");
 
         result = sysfs_create_link(&cdev->device.kobj,
                                    &device->dev.kobj,
                                    "device");
         if (result)
-                printk(KERN_ERR PREFIX "Create sysfs link\n");
+                dev_err(&device->dev, "Failed to create sysfs link "
+                        "'device'\n");
 
         result = acpi_fan_add_fs(device);
         if (result)
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 2f173e83f8a7..084109507c9f 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -146,8 +146,7 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
         acpi_status status;
 
         if (dev->archdata.acpi_handle) {
-                printk(KERN_WARNING PREFIX
-                       "Drivers changed 'acpi_handle' for %s\n", dev->bus_id);
+                dev_warn(dev, "Drivers changed 'acpi_handle'\n");
                 return -EINVAL;
         }
         get_device(dev);
@@ -195,8 +194,7 @@ static int acpi_unbind_one(struct device *dev)
                 /* acpi_bind_one increase refcnt by one */
                 put_device(dev);
         } else {
-                printk(KERN_ERR PREFIX
-                       "Oops, 'acpi_handle' corrupt for %s\n", dev->bus_id);
+                dev_err(dev, "Oops, 'acpi_handle' corrupt\n");
         }
         return 0;
 }
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index ec0f2d581ece..e36422a7122c 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -714,9 +714,8 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
                 goto end;
         }
 
-        printk(KERN_INFO PREFIX
-                "%s is registered as cooling_device%d\n",
-                device->dev.bus_id, pr->cdev->id);
+        dev_info(&device->dev, "registered as cooling_device%d\n",
+                 pr->cdev->id);
 
         result = sysfs_create_link(&device->dev.kobj,
                                    &pr->cdev->device.kobj,
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index f3132aa47a69..f6f52c1a2aba 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -471,7 +471,7 @@ static int acpi_device_register(struct acpi_device *device,
         device->dev.release = &acpi_device_release;
         result = device_add(&device->dev);
         if(result) {
-                printk(KERN_ERR PREFIX "Error adding device %s", device->dev.bus_id);
+                dev_err(&device->dev, "Error adding device\n");
                 goto end;
         }
 
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 84c795fb9b1e..30a341337933 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1179,8 +1179,8 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
 
         tz->tz_enabled = 1;
 
-        printk(KERN_INFO PREFIX "%s is registered as thermal_zone%d\n",
-                        tz->device->dev.bus_id, tz->thermal_zone->id);
+        dev_info(&tz->device->dev, "registered as thermal_zone%d\n",
+                 tz->thermal_zone->id);
         return 0;
 }
 
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 64c889331f3b..37b9e16710d6 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -762,9 +762,8 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
                 if (IS_ERR(device->cdev))
                         return;
 
-                printk(KERN_INFO PREFIX
-                        "%s is registered as cooling_device%d\n",
-                        device->dev->dev.bus_id, device->cdev->id);
+                dev_info(&device->dev->dev, "registered as cooling_device%d\n",
+                         device->cdev->id);
                 result = sysfs_create_link(&device->dev->dev.kobj,
                                 &device->cdev->device.kobj,
                                 "thermal_cooling");