3 files changed, 30 insertions, 28 deletions

diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 4192901cab40..048901a1111a 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -182,31 +182,31 @@ static void rackmeter_setup_dbdma(struct rackmeter *rm)
 
         /* Prepare 4 dbdma commands for the 2 buffers */
         memset(cmd, 0, 4 * sizeof(struct dbdma_cmd));
-        st_le16(&cmd->req_count, 4);
-        st_le16(&cmd->command, STORE_WORD | INTR_ALWAYS | KEY_SYSTEM);
-        st_le32(&cmd->phy_addr, rm->dma_buf_p +
+        cmd->req_count = cpu_to_le16(4);
+        cmd->command = cpu_to_le16(STORE_WORD | INTR_ALWAYS | KEY_SYSTEM);
+        cmd->phy_addr = cpu_to_le32(rm->dma_buf_p +
                 offsetof(struct rackmeter_dma, mark));
-        st_le32(&cmd->cmd_dep, 0x02000000);
+        cmd->cmd_dep = cpu_to_le32(0x02000000);
         cmd++;
 
-        st_le16(&cmd->req_count, SAMPLE_COUNT * 4);
-        st_le16(&cmd->command, OUTPUT_MORE);
-        st_le32(&cmd->phy_addr, rm->dma_buf_p +
+        cmd->req_count = cpu_to_le16(SAMPLE_COUNT * 4);
+        cmd->command = cpu_to_le16(OUTPUT_MORE);
+        cmd->phy_addr = cpu_to_le32(rm->dma_buf_p +
                 offsetof(struct rackmeter_dma, buf1));
         cmd++;
 
-        st_le16(&cmd->req_count, 4);
-        st_le16(&cmd->command, STORE_WORD | INTR_ALWAYS | KEY_SYSTEM);
-        st_le32(&cmd->phy_addr, rm->dma_buf_p +
+        cmd->req_count = cpu_to_le16(4);
+        cmd->command = cpu_to_le16(STORE_WORD | INTR_ALWAYS | KEY_SYSTEM);
+        cmd->phy_addr = cpu_to_le32(rm->dma_buf_p +
                 offsetof(struct rackmeter_dma, mark));
-        st_le32(&cmd->cmd_dep, 0x01000000);
+        cmd->cmd_dep = cpu_to_le32(0x01000000);
         cmd++;
 
-        st_le16(&cmd->req_count, SAMPLE_COUNT * 4);
-        st_le16(&cmd->command, OUTPUT_MORE | BR_ALWAYS);
-        st_le32(&cmd->phy_addr, rm->dma_buf_p +
+        cmd->req_count = cpu_to_le16(SAMPLE_COUNT * 4);
+        cmd->command = cpu_to_le16(OUTPUT_MORE | BR_ALWAYS);
+        cmd->phy_addr = cpu_to_le32(rm->dma_buf_p +
                 offsetof(struct rackmeter_dma, buf2));
-        st_le32(&cmd->cmd_dep, rm->dma_buf_p);
+        cmd->cmd_dep = cpu_to_le32(rm->dma_buf_p);
 
         rackmeter_do_pause(rm, 0);
 }
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 10ae69bcbbd2..d531f804455d 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -557,8 +557,7 @@ int __init smu_init (void)
         return 0;
 
 fail_msg_node:
-        if (smu->msg_node)
-                of_node_put(smu->msg_node);
+        of_node_put(smu->msg_node);
 fail_db_node:
         of_node_put(smu->db_node);
 fail_bootmem:
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index dee88e59f0d3..f9512bfa6c3c 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -329,10 +329,11 @@ int __init find_via_pmu(void)
                                 gaddr = of_translate_address(gpiop, reg);
                         if (gaddr != OF_BAD_ADDR)
                                 gpio_reg = ioremap(gaddr, 0x10);
+                        of_node_put(gpiop);
                 }
                 if (gpio_reg == NULL) {
                         printk(KERN_ERR "via-pmu: Can't find GPIO reg !\n");
-                        goto fail_gpio;
+                        goto fail;
                 }
         } else
                 pmu_kind = PMU_UNKNOWN;
@@ -340,7 +341,7 @@ int __init find_via_pmu(void)
         via = ioremap(taddr, 0x2000);
         if (via == NULL) {
                 printk(KERN_ERR "via-pmu: Can't map address !\n");
-                goto fail;
+                goto fail_via_remap;
         }
         
         out_8(&via[IER], IER_CLR | 0x7f);       /* disable all intrs */
@@ -348,10 +349,8 @@ int __init find_via_pmu(void)
 
         pmu_state = idle;
 
-        if (!init_pmu()) {
-                via = NULL;
-                return 0;
-        }
+        if (!init_pmu())
+                goto fail_init;
 
         printk(KERN_INFO "PMU driver v%d initialized for %s, firmware: %02x\n",
                PMU_DRIVER_VERSION, pbook_type[pmu_kind], pmu_version);
@@ -359,11 +358,15 @@ int __init find_via_pmu(void)
         sys_ctrler = SYS_CTRLER_PMU;
         
         return 1;
- fail:
-        of_node_put(vias);
+
+ fail_init:
+        iounmap(via);
+        via = NULL;
+ fail_via_remap:
         iounmap(gpio_reg);
         gpio_reg = NULL;
- fail_gpio:
+ fail:
+        of_node_put(vias);
         vias = NULL;
         return 0;
 }
@@ -2109,7 +2112,7 @@ pmu_read(struct file *file, char __user *buf,
 
         spin_lock_irqsave(&pp->lock, flags);
         add_wait_queue(&pp->wait, &wait);
-        current->state = TASK_INTERRUPTIBLE;
+        set_current_state(TASK_INTERRUPTIBLE);
 
         for (;;) {
                 ret = -EAGAIN;
@@ -2138,7 +2141,7 @@ pmu_read(struct file *file, char __user *buf,
                 schedule();
                 spin_lock_irqsave(&pp->lock, flags);
         }
-        current->state = TASK_RUNNING;
+        __set_current_state(TASK_RUNNING);
         remove_wait_queue(&pp->wait, &wait);
         spin_unlock_irqrestore(&pp->lock, flags);