Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

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

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 768b2c11a2311d6efa8237e7868c4c642d8998dc..885867a86de81b6948b1e7671e059903047b535e 100644 (file)
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -185,7 +185,7 @@ static struct usb_driver mts_usb_driver = {
        printk( KERN_DEBUG MTS_NAME x )
 
 #define MTS_DEBUG_GOT_HERE() \
-       MTS_DEBUG("got to %s:%d (%s)\n", __FILE__, (int)__LINE__, __PRETTY_FUNCTION__ )
+       MTS_DEBUG("got to %s:%d (%s)\n", __FILE__, (int)__LINE__, __func__ )
 #define MTS_DEBUG_INT() \
        do { MTS_DEBUG_GOT_HERE(); \
             MTS_DEBUG("transfer = 0x%x context = 0x%x\n",(int)transfer,(int)context ); \
@@ -446,7 +446,8 @@ static void mts_data_done( struct urb* transfer )
        MTS_INT_INIT();
 
        if ( context->data_length != transfer->actual_length ) {
-               context->srb->resid = context->data_length - transfer->actual_length;
+               scsi_set_resid(context->srb, context->data_length -
+                              transfer->actual_length);
        } else if ( unlikely(status) ) {
                context->srb->result = (status == -ENOENT ? DID_ABORT : DID_ERROR)<<16;
        }
@@ -490,7 +491,8 @@ static void mts_command_done( struct urb *transfer )
                                           context->data_pipe,
                                           context->data,
                                           context->data_length,
-                                          context->srb->use_sg > 1 ? mts_do_sg : mts_data_done);
+                                          scsi_sg_count(context->srb) > 1 ?
+                                                  mts_do_sg : mts_data_done);
                } else {
                        mts_get_status(transfer);
                }
@@ -505,21 +507,22 @@ static void mts_do_sg (struct urb* transfer)
        int status = transfer->status;
        MTS_INT_INIT();
 
-       MTS_DEBUG("Processing fragment %d of %d\n", context->fragment,context->srb->use_sg);
+       MTS_DEBUG("Processing fragment %d of %d\n", context->fragment,
+                                                 scsi_sg_count(context->srb));
 
        if (unlikely(status)) {
                 context->srb->result = (status == -ENOENT ? DID_ABORT : DID_ERROR)<<16;
                mts_transfer_cleanup(transfer);
         }
 
-       sg = context->srb->request_buffer;
+       sg = scsi_sglist(context->srb);
        context->fragment++;
        mts_int_submit_urb(transfer,
                           context->data_pipe,
-                          page_address(sg[context->fragment].page) +
-                          sg[context->fragment].offset,
+                          sg_virt(&sg[context->fragment]),
                           sg[context->fragment].length,
-                          context->fragment + 1 == context->srb->use_sg ? mts_data_done : mts_do_sg);
+                          context->fragment + 1 == scsi_sg_count(context->srb) ?
+                          mts_data_done : mts_do_sg);
        return;
 }
 
@@ -547,21 +550,13 @@ mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)
        desc->context.srb = srb;
        desc->context.fragment = 0;
 
-       if (!srb->use_sg) {
-               if ( !srb->request_bufflen ){
-                       desc->context.data = NULL;
-                       desc->context.data_length = 0;
-                       return;
-               } else {
-                       desc->context.data = srb->request_buffer;
-                       desc->context.data_length = srb->request_bufflen;
-                       MTS_DEBUG("length = %d or %d\n",
-                                 srb->request_bufflen, srb->bufflen);
-               }
+       if (!scsi_bufflen(srb)) {
+               desc->context.data = NULL;
+               desc->context.data_length = 0;
+               return;
        } else {
-               MTS_DEBUG("Using scatter/gather\n");
-               sg = srb->request_buffer;
-               desc->context.data = page_address(sg[0].page) + sg[0].offset;
+               sg = scsi_sglist(srb);
+               desc->context.data = sg_virt(&sg[0]);
                desc->context.data_length = sg[0].length;
        }
 
@@ -799,7 +794,6 @@ static int mts_usb_probe(struct usb_interface *intf,
 
        new_desc->usb_dev = dev;
        new_desc->usb_intf = intf;
-       init_MUTEX(&new_desc->lock);
 
        /* endpoints */
        new_desc->ep_out = ep_out;
@@ -824,7 +818,7 @@ static int mts_usb_probe(struct usb_interface *intf,
                goto out_kfree2;
 
        new_desc->host->hostdata[0] = (unsigned long)new_desc;
-       if (scsi_add_host(new_desc->host, NULL)) {
+       if (scsi_add_host(new_desc->host, &dev->dev)) {
                err_retval = -EIO;
                goto out_host_put;
        }