[SCSI] remove Scsi_Host_Template typedef

[linux-2.6] / drivers / usb / image / microtek.c

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 7d21a4f5c4254a1cc4a0085888720cb87efbb576..61a2604cce4f47f6c08c78556bbe6c2b4261b6ef 100644 (file)
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -361,8 +361,7 @@ int mts_scsi_queuecommand (Scsi_Cmnd *srb, mts_scsi_cmnd_callback callback );
 static void mts_transfer_cleanup( struct urb *transfer );
 static void mts_do_sg(struct urb * transfer, struct pt_regs *regs);
 
-
-inline static
+static inline
 void mts_int_submit_urb (struct urb* transfer,
                        int pipe,
                        void* data,
@@ -633,7 +632,7 @@ out:
        return err;
 }
 
-static Scsi_Host_Template mts_scsi_host_template = {
+static struct scsi_host_template mts_scsi_host_template = {
        .module                 = THIS_MODULE,
        .name                   = "microtekX6",
        .proc_name              = "microtekX6",
@@ -774,11 +773,10 @@ static int mts_usb_probe(struct usb_interface *intf,
        }
        
        
-       new_desc = kmalloc(sizeof(struct mts_desc), GFP_KERNEL);
+       new_desc = kzalloc(sizeof(struct mts_desc), GFP_KERNEL);
        if (!new_desc)
                goto out;
 
-       memset(new_desc, 0, sizeof(*new_desc));
        new_desc->urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!new_desc->urb)
                goto out_kfree;