Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / drivers / acpi / fan.c

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 55c17afbe669c86cc6da590994a143fe6d543e77..60d54d1f6b195dc282528447682deb7cb3259d1d 100644 (file)
--- 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;
+       device->driver_data = 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)
@@ -327,8 +327,8 @@ static int acpi_fan_resume(struct acpi_device *device)
 
        result = acpi_bus_get_power(device->handle, &power_state);
        if (result) {
-               ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                 "Error reading fan power state\n"));
+               printk(KERN_ERR PREFIX
+                                 "Error reading fan power state\n");
                return result;
        }