5 files changed, 7 insertions, 11 deletions

diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c
index fd1c4ba63367..058d0be5cbe2 100644
--- a/drivers/acpi/hardware/hwsleep.c
+++ b/drivers/acpi/hardware/hwsleep.c
@@ -286,13 +286,13 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
         }
 
         /*
+         * 1) Disable/Clear all GPEs
          * 2) Enable all wakeup GPEs
          */
         status = acpi_hw_disable_all_gpes();
         if (ACPI_FAILURE(status)) {
                 return_ACPI_STATUS(status);
         }
-
         acpi_gbl_system_awake_and_running = FALSE;
 
         status = acpi_hw_enable_all_wakeup_gpes();
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 07c18dbde698..0c41db3075a5 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -258,7 +258,8 @@ acpi_physical_address __init acpi_os_get_root_pointer(void)
         }
 }
 
-void __iomem *acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
+void __iomem *__init_refok
+acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
 {
         if (phys > ULONG_MAX) {
                 printk(KERN_ERR PREFIX "Cannot map memory that high\n");
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 62010c2481b3..76d9c669d2d8 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -51,10 +51,8 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(int segment,
                                                           int bus,
                                                           int device, int pin)
 {
-        struct list_head *node = NULL;
         struct acpi_prt_entry *entry = NULL;
 
-
         if (!acpi_prt.count)
                 return NULL;
 
@@ -64,8 +62,7 @@ static struct acpi_prt_entry *acpi_pci_irq_find_prt_entry(int segment,
          *
          */
         spin_lock(&acpi_prt_lock);
-        list_for_each(node, &acpi_prt.entries) {
-                entry = list_entry(node, struct acpi_prt_entry, node);
+        list_for_each_entry(entry, &acpi_prt.entries, node) {
                 if ((segment == entry->id.segment)
                     && (bus == entry->id.bus)
                     && (device == entry->id.device)
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index af1769a20c7a..76bf6d90c700 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -458,11 +458,9 @@ int acpi_power_transition(struct acpi_device *device, int state)
         }
 
      end:
-        if (result) {
+        if (result)
                 device->power.state = ACPI_STATE_UNKNOWN;
-                printk(KERN_WARNING PREFIX "Transitioning device [%s] to D%d\n",
-                              device->pnp.bus_id, state);
-        } else {
+        else {
         /* We shouldn't change the state till all above operations succeed */
                 device->power.state = state;
         }
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 7f97e32fc33f..293a1cbb47c0 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -170,7 +170,7 @@ static int acpi_pm_enter(suspend_state_t pm_state)
         /* Reprogram control registers and execute _BFS */
         acpi_leave_sleep_state_prep(acpi_state);
 
-        /* ACPI 3.0 specs (P62) says that it's the responsabilty
+        /* ACPI 3.0 specs (P62) says that it's the responsibility
          * of the OSPM to clear the status bit [ implying that the
          * POWER_BUTTON event should not reach userspace ]
          */