Loading drivers/scsi/a3000.c +140 −140 Original line number Diff line number Diff line Loading @@ -21,6 +21,7 @@ #include <linux/stat.h> #define DMA(ptr) ((a3000_scsiregs *)((ptr)->base)) #define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata)) Loading @@ -35,8 +36,7 @@ static irqreturn_t a3000_intr (int irq, void *dummy) if (!(status & ISTR_INT_P)) return IRQ_NONE; if (status & ISTR_INTS) { if (status & ISTR_INTS) { spin_lock_irqsave(a3000_host->host_lock, flags); wd33c93_intr(a3000_host); spin_unlock_irqrestore(a3000_host->host_lock, flags); Loading @@ -57,10 +57,9 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in) * end of a physical memory chunk, then allocate a bounce * buffer */ if (addr & A3000_XFER_MASK) { HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511) & ~0x1ff; if (addr & A3000_XFER_MASK) { HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511) & ~0x1ff; HDATA(a3000_host)->dma_bounce_buffer = kmalloc(HDATA(a3000_host)->dma_bounce_len, GFP_KERNEL); Loading Loading @@ -91,12 +90,13 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in) /* setup DMA *physical* address */ DMA(a3000_host)->ACR = addr; if (dir_in) if (dir_in) { /* invalidate any cache */ cache_clear(addr, cmd->SCp.this_residual); else } else { /* push any dirty cache */ cache_push(addr, cmd->SCp.this_residual); } /* start DMA */ mb(); /* make sure setup is completed */ Loading drivers/scsi/a3000.h +23 −23 File changed.Contains only whitespace changes. Show changes Loading
drivers/scsi/a3000.c +140 −140 Original line number Diff line number Diff line Loading @@ -21,6 +21,7 @@ #include <linux/stat.h> #define DMA(ptr) ((a3000_scsiregs *)((ptr)->base)) #define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata)) Loading @@ -35,8 +36,7 @@ static irqreturn_t a3000_intr (int irq, void *dummy) if (!(status & ISTR_INT_P)) return IRQ_NONE; if (status & ISTR_INTS) { if (status & ISTR_INTS) { spin_lock_irqsave(a3000_host->host_lock, flags); wd33c93_intr(a3000_host); spin_unlock_irqrestore(a3000_host->host_lock, flags); Loading @@ -57,10 +57,9 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in) * end of a physical memory chunk, then allocate a bounce * buffer */ if (addr & A3000_XFER_MASK) { HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511) & ~0x1ff; if (addr & A3000_XFER_MASK) { HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511) & ~0x1ff; HDATA(a3000_host)->dma_bounce_buffer = kmalloc(HDATA(a3000_host)->dma_bounce_len, GFP_KERNEL); Loading Loading @@ -91,12 +90,13 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in) /* setup DMA *physical* address */ DMA(a3000_host)->ACR = addr; if (dir_in) if (dir_in) { /* invalidate any cache */ cache_clear(addr, cmd->SCp.this_residual); else } else { /* push any dirty cache */ cache_push(addr, cmd->SCp.this_residual); } /* start DMA */ mb(); /* make sure setup is completed */ Loading