Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / iseries / viopath.c

diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index efeb6ae9df64ca16b25b1c31b0e03eb2d57a8b69..84e7ee2c086f59f21bec9a99b0ce368b07b11676 100644 (file)
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -117,11 +117,11 @@ static int proc_viopath_show(struct seq_file *m, void *v)
        HvLpEvent_Rc hvrc;
        DECLARE_MUTEX_LOCKED(Semaphore);
        struct device_node *node;
+       const char *sysid;
 
-       buf = kmalloc(HW_PAGE_SIZE, GFP_KERNEL);
+       buf = kzalloc(HW_PAGE_SIZE, GFP_KERNEL);
        if (!buf)
                return 0;
-       memset(buf, 0, HW_PAGE_SIZE);
 
        handle = dma_map_single(iSeries_vio_dev, buf, HW_PAGE_SIZE,
                                DMA_FROM_DEVICE);
@@ -152,15 +152,15 @@ static int proc_viopath_show(struct seq_file *m, void *v)
        seq_printf(m, "AVAILABLE_VETH=%x\n", vlanMap);
 
        node = of_find_node_by_path("/");
-       buf = NULL;
+       sysid = NULL;
        if (node != NULL)
-               buf = get_property(node, "system-id", NULL);
+               sysid = get_property(node, "system-id", NULL);
 
-       if (buf == NULL)
+       if (sysid == NULL)
                seq_printf(m, "SRLNBR=<UNKNOWN>\n");
        else
                /* Skip "IBM," on front of serial number, see dt.c */
-               seq_printf(m, "SRLNBR=%s\n", buf + 4);
+               seq_printf(m, "SRLNBR=%s\n", sysid + 4);
 
        of_node_put(node);
 
@@ -377,7 +377,7 @@ void vio_set_hostlp(void)
 }
 EXPORT_SYMBOL(vio_set_hostlp);
 
-static void vio_handleEvent(struct HvLpEvent *event, struct pt_regs *regs)
+static void vio_handleEvent(struct HvLpEvent *event)
 {
        HvLpIndex remoteLp;
        int subtype = (event->xSubtype & VIOMAJOR_SUBTYPE_MASK)