USB: microtek: use set_host_byte()

The SCSI layer is providing a new macro. Let's use it.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Link: https://lore.kernel.org/r/20200916100302.30855-1-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 360416680e8237c4a1407d555e943d90749877b7..59b02a539963bc1af0e5093adf2dfbeda1938374 100644 (file)
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -389,7 +389,7 @@ void mts_int_submit_urb (struct urb* transfer,
        res = usb_submit_urb( transfer, GFP_ATOMIC );
        if ( unlikely(res) ) {
                MTS_INT_ERROR( "could not submit URB! Error was %d\n",(int)res );
-               context->srb->result = DID_ERROR << 16;
+               set_host_byte(context->srb, DID_ERROR);
                mts_transfer_cleanup(transfer);
        }
 }
@@ -438,7 +438,7 @@ static void mts_data_done( struct urb* transfer )
                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;
+               set_host_byte(context->srb, (status == -ENOENT ? DID_ABORT : DID_ERROR));
        }
 
        mts_get_status(transfer);
@@ -455,12 +455,12 @@ static void mts_command_done( struct urb *transfer )
                if (status == -ENOENT) {
                        /* We are being killed */
                        MTS_DEBUG_GOT_HERE();
-                       context->srb->result = DID_ABORT<<16;
+                       set_host_byte(context->srb, DID_ABORT);
                 } else {
                        /* A genuine error has occurred */
                        MTS_DEBUG_GOT_HERE();
 
-                       context->srb->result = DID_ERROR<<16;
+                       set_host_byte(context->srb, DID_ERROR);
                 }
                mts_transfer_cleanup(transfer);
 
@@ -495,7 +495,7 @@ static void mts_do_sg (struct urb* transfer)
                                                  scsi_sg_count(context->srb));
 
        if (unlikely(status)) {
-                context->srb->result = (status == -ENOENT ? DID_ABORT : DID_ERROR)<<16;
+                set_host_byte(context->srb, (status == -ENOENT ? DID_ABORT : DID_ERROR));
                mts_transfer_cleanup(transfer);
         }
 
@@ -578,7 +578,7 @@ mts_scsi_queuecommand_lck(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback
 
                MTS_DEBUG("this device doesn't exist\n");
 
-               srb->result = DID_BAD_TARGET << 16;
+               set_host_byte(srb, DID_BAD_TARGET);
 
                if(likely(callback != NULL))
                        callback(srb);
@@ -605,7 +605,7 @@ mts_scsi_queuecommand_lck(struct scsi_cmnd *srb, mts_scsi_cmnd_callback callback
 
        if(unlikely(res)){
                MTS_ERROR("error %d submitting URB\n",(int)res);
-               srb->result = DID_ERROR << 16;
+               set_host_byte(srb, DID_ERROR);
 
                if(likely(callback != NULL))
                        callback(srb);