aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-02-06 04:36:29 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:01 -0500
commit7b892806b09dca77db8ef6acbb6c51271578d34d (patch)
tree594e77bbf8b9147d4cd39a67a89c26ada1572546 /drivers/scsi
parentb524b9adb3f655697fe6df9197b3ed6f14bc1729 (diff)
cleanup after APUS removal
After the APUS removal, some code can be removed. Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Cc: Karsten Keil <kkeil@suse.de> Cc: James Bottomley <James.Bottomley@steeleye.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/a2091.c3
-rw-r--r--drivers/scsi/a3000.c3
-rw-r--r--drivers/scsi/gvp11.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c
index 23f27c9c9895..5ac3a3e8dfaf 100644
--- a/drivers/scsi/a2091.c
+++ b/drivers/scsi/a2091.c
@@ -46,8 +46,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
46 struct Scsi_Host *instance = cmd->device->host; 46 struct Scsi_Host *instance = cmd->device->host;
47 47
48 /* don't allow DMA if the physical address is bad */ 48 /* don't allow DMA if the physical address is bad */
49 if (addr & A2091_XFER_MASK || 49 if (addr & A2091_XFER_MASK)
50 (!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))
51 { 50 {
52 HDATA(instance)->dma_bounce_len = (cmd->SCp.this_residual + 511) 51 HDATA(instance)->dma_bounce_len = (cmd->SCp.this_residual + 511)
53 & ~0x1ff; 52 & ~0x1ff;
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index d7255c8bf281..3aeec963940b 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -54,8 +54,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
54 * end of a physical memory chunk, then allocate a bounce 54 * end of a physical memory chunk, then allocate a bounce
55 * buffer 55 * buffer
56 */ 56 */
57 if (addr & A3000_XFER_MASK || 57 if (addr & A3000_XFER_MASK)
58 (!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))
59 { 58 {
60 HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511) 59 HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511)
61 & ~0x1ff; 60 & ~0x1ff;
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c
index 37741e9b5c3b..91f85226d08f 100644
--- a/drivers/scsi/gvp11.c
+++ b/drivers/scsi/gvp11.c
@@ -54,8 +54,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
54 static int scsi_alloc_out_of_range = 0; 54 static int scsi_alloc_out_of_range = 0;
55 55
56 /* use bounce buffer if the physical address is bad */ 56 /* use bounce buffer if the physical address is bad */
57 if (addr & HDATA(cmd->device->host)->dma_xfer_mask || 57 if (addr & HDATA(cmd->device->host)->dma_xfer_mask)
58 (!dir_in && mm_end_of_chunk (addr, cmd->SCp.this_residual)))
59 { 58 {
60 HDATA(cmd->device->host)->dma_bounce_len = (cmd->SCp.this_residual + 511) 59 HDATA(cmd->device->host)->dma_bounce_len = (cmd->SCp.this_residual + 511)
61 & ~0x1ff; 60 & ~0x1ff;