Pull thermal into release branch

[linux-drm-fsl-dcu.git] / arch / i386 / mach-voyager / voyager_cat.c

diff --git a/arch/i386/mach-voyager/voyager_cat.c b/arch/i386/mach-voyager/voyager_cat.c
index f50c6c6ad680e8eb7c2092757d18291fa3e68ab6..26a2d4c54b684e8d3da8f451ad3c2be9e1ce262c 100644 (file)
--- a/arch/i386/mach-voyager/voyager_cat.c
+++ b/arch/i386/mach-voyager/voyager_cat.c
@@ -776,7 +776,7 @@ voyager_cat_init(void)
                for(asic=0; asic < (*modpp)->num_asics; asic++) {
                        int j;
                        voyager_asic_t *asicp = *asicpp 
-                               = kmalloc(sizeof(voyager_asic_t), GFP_KERNEL); /*&voyager_asic_storage[asic_count++];*/
+                               = kzalloc(sizeof(voyager_asic_t), GFP_KERNEL); /*&voyager_asic_storage[asic_count++];*/
                        voyager_sp_table_t *sp_table;
                        voyager_at_t *asic_table;
                        voyager_jtt_t *jtag_table;
@@ -785,7 +785,6 @@ voyager_cat_init(void)
                                printk("**WARNING** kmalloc failure in cat_init\n");
                                continue;
                        }
-                       memset(asicp, 0, sizeof(voyager_asic_t));
                        asicpp = &(asicp->next);
                        asicp->asic_location = asic;
                        sp_table = (voyager_sp_table_t *)(eprom_buf + sp_offset);
@@ -851,8 +850,7 @@ voyager_cat_init(void)
 #endif
 
                {
-                       struct resource *res = kmalloc(sizeof(struct resource),GFP_KERNEL);
-                       memset(res, 0, sizeof(struct resource));
+                       struct resource *res = kzalloc(sizeof(struct resource),GFP_KERNEL);
                        res->name = kmalloc(128, GFP_KERNEL);
                        sprintf((char *)res->name, "Voyager %s Quad CPI", cat_module_name(i));
                        res->start = qic_addr;
@@ -1113,7 +1111,7 @@ voyager_cat_do_common_interrupt(void)
                                printk(KERN_ERR "Voyager front panel switch turned off\n");
                                voyager_status.switch_off = 1;
                                voyager_status.request_from_kernel = 1;
-                               up(&kvoyagerd_sem);
+                               wake_up_process(voyager_thread);
                        }
                        /* Tell the hardware we're taking care of the
                         * shutdown, otherwise it will power the box off
@@ -1159,7 +1157,7 @@ voyager_cat_do_common_interrupt(void)
                        outb(VOYAGER_CAT_END, CAT_CMD);
                        voyager_status.power_fail = 1;
                        voyager_status.request_from_kernel = 1;
-                       up(&kvoyagerd_sem);
+                       wake_up_process(voyager_thread);
                }