lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] a3000: Reindentation

Browse Source 
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Geert Uytterhoeven
2010-04-04 11:00:35 +02:00
committed by James Bottomley
parent be4540db06
commit 2135101340
2 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/scsi/a3000.c
View File

@@ -21,6 +21,7 @@
#include <linux/stat.h> #include <linux/stat.h>
#define DMA(ptr) ((a3000_scsiregs *)((ptr)->base)) #define DMA(ptr) ((a3000_scsiregs *)((ptr)->base))
#define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata)) #define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata))
@@ -35,8 +36,7 @@ static irqreturn_t a3000_intr (int irq, void *dummy)
if (!(status & ISTR_INT_P)) if (!(status & ISTR_INT_P))
return IRQ_NONE; return IRQ_NONE;
if (status & ISTR_INTS) if (status & ISTR_INTS) {
{
spin_lock_irqsave(a3000_host->host_lock, flags); spin_lock_irqsave(a3000_host->host_lock, flags);
wd33c93_intr(a3000_host); wd33c93_intr(a3000_host);
spin_unlock_irqrestore(a3000_host->host_lock, flags); spin_unlock_irqrestore(a3000_host->host_lock, flags);
@@ -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 * end of a physical memory chunk, then allocate a bounce
* buffer * buffer
*/ */
if (addr & A3000_XFER_MASK) if (addr & A3000_XFER_MASK) {
{ HDATA(a3000_host)->dma_bounce_len =
HDATA(a3000_host)->dma_bounce_len = (cmd->SCp.this_residual + 511) (cmd->SCp.this_residual + 511) & ~0x1ff;
& ~0x1ff;
HDATA(a3000_host)->dma_bounce_buffer = HDATA(a3000_host)->dma_bounce_buffer =
kmalloc(HDATA(a3000_host)->dma_bounce_len, GFP_KERNEL); kmalloc(HDATA(a3000_host)->dma_bounce_len, GFP_KERNEL);
@@ -91,12 +90,13 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
/* setup DMA *physical* address */ /* setup DMA *physical* address */
DMA(a3000_host)->ACR = addr; DMA(a3000_host)->ACR = addr;
if (dir_in) if (dir_in) {
/* invalidate any cache */ /* invalidate any cache */
cache_clear(addr, cmd->SCp.this_residual); cache_clear(addr, cmd->SCp.this_residual);
else } else {
/* push any dirty cache */ /* push any dirty cache */
cache_push(addr, cmd->SCp.this_residual); cache_push(addr, cmd->SCp.this_residual);
}
/* start DMA */ /* start DMA */
mb(); /* make sure setup is completed */ mb(); /* make sure setup is completed */