Merge branches 'acpi-ec', 'acpi-apei', 'acpi-soc' and 'acpi-misc'

[linux-2.6-microblaze.git] / drivers / acpi / sbshc.c

diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index 53c2862..7c62e14 100644 (file)
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -5,6 +5,8 @@
  * Copyright (c) 2007 Alexey Starikovskiy
  */
 
+#define pr_fmt(fmt) "ACPI: " fmt
+
 #include <linux/acpi.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
@@ -13,8 +15,6 @@
 #include <linux/interrupt.h>
 #include "sbshc.h"
 
-#define PREFIX "ACPI: "
-
 #define ACPI_SMB_HC_CLASS      "smbus_host_ctl"
 #define ACPI_SMB_HC_DEVICE_NAME        "ACPI SMBus HC"
 
@@ -109,7 +109,7 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
        u8 temp, sz = 0;
 
        if (!hc) {
-               printk(KERN_ERR PREFIX "host controller is not configured\n");
+               pr_err("host controller is not configured\n");
                return ret;
        }
 
@@ -231,7 +231,6 @@ static int smbus_alarm(void *context)
                case ACPI_SBS_BATTERY:
                        acpi_os_execute(OSL_NOTIFY_HANDLER,
                                        acpi_smbus_callback, hc);
-               default:;
        }
        mutex_unlock(&hc->lock);
        return 0;
@@ -254,7 +253,7 @@ static int acpi_smbus_hc_add(struct acpi_device *device)
 
        status = acpi_evaluate_integer(device->handle, "_EC", NULL, &val);
        if (ACPI_FAILURE(status)) {
-               printk(KERN_ERR PREFIX "error obtaining _EC.\n");
+               pr_err("error obtaining _EC.\n");
                return -EIO;
        }