OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m68k/scsi: mvme147 - Kill static global mvme147_host 

Acked-by: James Bottomley <James.Bottomley@suse.de>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven 2009-05-17 13:35:13 +02:00
parent d753722ee0
commit 4616ac7e84
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/scsi/mvme147.c
View File

@ -16,12 +16,12 @@
#include <linux/stat.h> #include <linux/stat.h>
static struct Scsi_Host *mvme147_host = NULL; static irqreturn_t mvme147_intr(int irq, void *data)
static irqreturn_t mvme147_intr(int irq, void *dummy)
{ {
struct Scsi_Host *instance = data;
if (irq == MVME147_IRQ_SCSI_PORT) if (irq == MVME147_IRQ_SCSI_PORT)
wd33c93_intr(mvme147_host); wd33c93_intr(instance);
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;
@ -29,7 +29,8 @@ static irqreturn_t mvme147_intr(int irq, void *dummy)
static int dma_setup(struct scsi_cmnd *cmd, int dir_in) static int dma_setup(struct scsi_cmnd *cmd, int dir_in)
{ {
struct WD33C93_hostdata *hdata = shost_priv(mvme147_host); struct Scsi_Host *instance = cmd->device->host;
struct WD33C93_hostdata *hdata = shost_priv(instance);
unsigned char flags = 0x01; unsigned char flags = 0x01;
unsigned long addr = virt_to_bus(cmd->SCp.ptr); unsigned long addr = virt_to_bus(cmd->SCp.ptr);
@ -66,6 +67,7 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,
int mvme147_detect(struct scsi_host_template *tpnt) int mvme147_detect(struct scsi_host_template *tpnt)
{ {
static unsigned char called = 0; static unsigned char called = 0;
struct Scsi_Host *instance;
wd33c93_regs regs; wd33c93_regs regs;
struct WD33C93_hostdata *hdata; struct WD33C93_hostdata *hdata;
@ -76,25 +78,25 @@ 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)); instance = scsi_register(tpnt, sizeof(struct WD33C93_hostdata));
if (!mvme147_host) if (!instance)
goto err_out; goto err_out;
mvme147_host->base = 0xfffe4000; instance->base = 0xfffe4000;
mvme147_host->irq = MVME147_IRQ_SCSI_PORT; instance->irq = MVME147_IRQ_SCSI_PORT;
regs.SASR = (volatile unsigned char *)0xfffe4000; regs.SASR = (volatile unsigned char *)0xfffe4000;
regs.SCMD = (volatile unsigned char *)0xfffe4001; regs.SCMD = (volatile unsigned char *)0xfffe4001;
hdata = shost_priv(mvme147_host); hdata = shost_priv(instance);
hdata->no_sync = 0xff; hdata->no_sync = 0xff;
hdata->fast = 0; hdata->fast = 0;
hdata->dma_mode = CTRL_DMA; hdata->dma_mode = CTRL_DMA;
wd33c93_init(mvme147_host, regs, dma_setup, dma_stop, WD33C93_FS_8_10); wd33c93_init(instance, regs, dma_setup, dma_stop, WD33C93_FS_8_10);
if (request_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr, 0, if (request_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr, 0,
"MVME147 SCSI PORT", mvme147_intr)) "MVME147 SCSI PORT", instance))
goto err_unregister; goto err_unregister;
if (request_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr, 0, if (request_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr, 0,
"MVME147 SCSI DMA", mvme147_intr)) "MVME147 SCSI DMA", instance))
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 */
@ -113,7 +115,7 @@ int mvme147_detect(struct scsi_host_template *tpnt)
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(instance);
err_out: err_out:
return 0; return 0;
} }