fbdev: move FBIO_WAITFORVSYNC to linux/fb.h

[safe/jmp/linux-2.6] / drivers / scsi / NCR_Q720.c

diff --git a/drivers/scsi/NCR_Q720.c b/drivers/scsi/NCR_Q720.c
index c39ffbb..afdbb9a 100644 (file)
--- a/drivers/scsi/NCR_Q720.c
+++ b/drivers/scsi/NCR_Q720.c
@@ -10,6 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mca.h>
+#include <linux/slab.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -54,7 +55,7 @@ static struct scsi_host_template NCR_Q720_tpnt = {
 };
 
 static irqreturn_t
-NCR_Q720_intr(int irq, void *data, struct pt_regs * regs)
+NCR_Q720_intr(int irq, void *data)
 {
        struct NCR_Q720_private *p = (struct NCR_Q720_private *)data;
        __u8 sir = (readb(p->mem_base + 0x0d) & 0xf0) >> 4;
@@ -68,7 +69,7 @@ NCR_Q720_intr(int irq, void *data, struct pt_regs * regs)
 
        while((siop = ffz(sir)) < p->siops) {
                sir |= 1<<siop;
-               ncr53c8xx_intr(irq, p->hosts[siop], regs);
+               ncr53c8xx_intr(irq, p->hosts[siop]);
        }
        return IRQ_HANDLED;
 }
@@ -148,11 +149,10 @@ NCR_Q720_probe(struct device *dev)
        __u32 base_addr, mem_size;
        void __iomem *mem_base;
 
-       p = kmalloc(sizeof(*p), GFP_KERNEL);
+       p = kzalloc(sizeof(*p), GFP_KERNEL);
        if (!p)
                return -ENOMEM;
 
-       memset(p, 0, sizeof(*p));
        pos2 = mca_device_read_pos(mca_dev, 2);
        /* enable device */
        pos2 |=  NCR_Q720_POS2_BOARD_ENABLE | NCR_Q720_POS2_INTERRUPT_ENABLE;