iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] mvme147: 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:34 +02:00
committed by James Bottomley
parent bb17b7871b
commit be4540db06
2 changed files with 77 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/scsi/mvme147.c
View File

@@ -13,16 +13,17 @@
#include "wd33c93.h" #include "wd33c93.h"
#include "mvme147.h" #include "mvme147.h"
#include<linux/stat.h> #include <linux/stat.h>
#define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata)) #define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata))
static struct Scsi_Host *mvme147_host = NULL; static struct Scsi_Host *mvme147_host = NULL;
static irqreturn_t mvme147_intr (int irq, void *dummy) static irqreturn_t mvme147_intr(int irq, void *dummy)
{ {
if (irq == MVME147_IRQ_SCSI_PORT) if (irq == MVME147_IRQ_SCSI_PORT)
wd33c93_intr (mvme147_host); wd33c93_intr(mvme147_host);
else else
m147_pcc->dma_intr = 0x89; /* Ack and enable ints */ m147_pcc->dma_intr = 0x89; /* Ack and enable ints */
return IRQ_HANDLED; return IRQ_HANDLED;
@@ -40,15 +41,16 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
/* remember direction */ /* remember direction */
HDATA(mvme147_host)->dma_dir = dir_in; HDATA(mvme147_host)->dma_dir = dir_in;
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 */
m147_pcc->dma_bcr = cmd->SCp.this_residual | (1<<24); m147_pcc->dma_bcr = cmd->SCp.this_residual | (1 << 24);
m147_pcc->dma_dadr = addr; m147_pcc->dma_dadr = addr;
m147_pcc->dma_cntrl = flags; m147_pcc->dma_cntrl = flags;
@@ -74,7 +76,7 @@ int mvme147_detect(struct scsi_host_template *tpnt)
tpnt->proc_name = "MVME147"; tpnt->proc_name = "MVME147";
tpnt->proc_info = &wd33c93_proc_info; tpnt->proc_info = &wd33c93_proc_info;
mvme147_host = scsi_register (tpnt, sizeof(struct WD33C93_hostdata)); mvme147_host = scsi_register(tpnt, sizeof(struct WD33C93_hostdata));
if (!mvme147_host) if (!mvme147_host)
goto err_out; goto err_out;
@@ -87,9 +89,11 @@ int mvme147_detect(struct scsi_host_template *tpnt)
HDATA(mvme147_host)->dma_mode = CTRL_DMA; HDATA(mvme147_host)->dma_mode = CTRL_DMA;
wd33c93_init(mvme147_host, regs, dma_setup, dma_stop, WD33C93_FS_8_10); wd33c93_init(mvme147_host, regs, dma_setup, dma_stop, WD33C93_FS_8_10);
if (request_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr, 0, "MVME147 SCSI PORT", mvme147_intr)) if (request_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr, 0,
"MVME147 SCSI PORT", mvme147_intr))
goto err_unregister; goto err_unregister;
if (request_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr, 0, "MVME147 SCSI DMA", mvme147_intr)) if (request_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr, 0,
"MVME147 SCSI DMA", mvme147_intr))
goto err_free_irq; goto err_free_irq;
#if 0 /* Disabled; causes problems booting */ #if 0 /* Disabled; causes problems booting */
m147_pcc->scsi_interrupt = 0x10; /* Assert SCSI bus reset */ m147_pcc->scsi_interrupt = 0x10; /* Assert SCSI bus reset */
@@ -105,11 +109,11 @@ int mvme147_detect(struct scsi_host_template *tpnt)
return 1; return 1;
err_free_irq: err_free_irq:
free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr); free_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr);
err_unregister: err_unregister:
scsi_unregister(mvme147_host); scsi_unregister(mvme147_host);
err_out: err_out:
return 0; return 0;
} }