Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2c1afa5 authored by Boaz Harrosh's avatar Boaz Harrosh Committed by James Bottomley
Browse files

[SCSI] a2091: convert to accessors and !use_sg cleanup 



 - convert to accessors and !use_sg cleanup

Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 7410d849

drivers/scsi/a2091.c

+5 −31
Original line number Diff line number Diff line
@@ -74,17 +74,8 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in) 


	if (!dir_in) {

		/* copy to bounce buffer for a write */

	    if (cmd->use_sg)

#if 0

		panic ("scsi%ddma: incomplete s/g support",

		       instance->host_no);

#else

		memcpy (HDATA(instance)->dma_bounce_buffer,

			cmd->SCp.ptr, cmd->SCp.this_residual);

#endif

	    else

		memcpy (HDATA(instance)->dma_bounce_buffer,

			cmd->request_buffer, cmd->request_bufflen);

	}

    }
@@ -144,11 +135,6 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, 


    /* copy from a bounce buffer, if necessary */

    if (status && HDATA(instance)->dma_bounce_buffer) {

	if (SCpnt && SCpnt->use_sg) {

#if 0

	    panic ("scsi%d: incomplete s/g support",

		   instance->host_no);

#else

	if( HDATA(instance)->dma_dir )

		memcpy (SCpnt->SCp.ptr, 

			HDATA(instance)->dma_bounce_buffer,
@@ -156,18 +142,6 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, 
	kfree (HDATA(instance)->dma_bounce_buffer);

	HDATA(instance)->dma_bounce_buffer = NULL;

	HDATA(instance)->dma_bounce_len = 0;

	    

#endif

	} else {

	    if (HDATA(instance)->dma_dir && SCpnt)

		memcpy (SCpnt->request_buffer,

			HDATA(instance)->dma_bounce_buffer,

			SCpnt->request_bufflen);



	    kfree (HDATA(instance)->dma_bounce_buffer);

	    HDATA(instance)->dma_bounce_buffer = NULL;

	    HDATA(instance)->dma_bounce_len = 0;

	}

    }

}