Commit 279a5636 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] Sun-3 SCSI

Sun-3 SCSI updates (from Sam Creasey):
  - Define sun3scsi_release() in sun3_scsi and sun3_scsi_vme so that the
    drivers will actually be loaded by the SCSI subsystem.
  - Remove some warnings.
parent d62db5a6
...@@ -308,7 +308,6 @@ int sun3scsi_detect(Scsi_Host_Template * tpnt) ...@@ -308,7 +308,6 @@ int sun3scsi_detect(Scsi_Host_Template * tpnt)
return 1; return 1;
} }
#ifdef MODULE
int sun3scsi_release (struct Scsi_Host *shpnt) int sun3scsi_release (struct Scsi_Host *shpnt)
{ {
if (shpnt->irq != SCSI_IRQ_NONE) if (shpnt->irq != SCSI_IRQ_NONE)
...@@ -318,7 +317,6 @@ int sun3scsi_release (struct Scsi_Host *shpnt) ...@@ -318,7 +317,6 @@ int sun3scsi_release (struct Scsi_Host *shpnt)
return 0; return 0;
} }
#endif
#ifdef RESET_BOOT #ifdef RESET_BOOT
/* /*
......
...@@ -52,11 +52,7 @@ static int sun3scsi_detect (Scsi_Host_Template *); ...@@ -52,11 +52,7 @@ static int sun3scsi_detect (Scsi_Host_Template *);
static const char *sun3scsi_info (struct Scsi_Host *); static const char *sun3scsi_info (struct Scsi_Host *);
static int sun3scsi_bus_reset(Scsi_Cmnd *); static int sun3scsi_bus_reset(Scsi_Cmnd *);
static int sun3scsi_queue_command (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); static int sun3scsi_queue_command (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
#ifdef MODULE
static int sun3scsi_release (struct Scsi_Host *); static int sun3scsi_release (struct Scsi_Host *);
#else
#define sun3scsi_release NULL
#endif
#ifndef CMD_PER_LUN #ifndef CMD_PER_LUN
#define CMD_PER_LUN 2 #define CMD_PER_LUN 2
......
...@@ -140,7 +140,7 @@ static struct Scsi_Host *default_instance; ...@@ -140,7 +140,7 @@ static struct Scsi_Host *default_instance;
static int sun3scsi_detect(Scsi_Host_Template * tpnt) static int sun3scsi_detect(Scsi_Host_Template * tpnt)
{ {
unsigned long ioaddr, irq; unsigned long ioaddr, irq = 0;
static int called = 0; static int called = 0;
struct Scsi_Host *instance; struct Scsi_Host *instance;
int i; int i;
...@@ -277,17 +277,15 @@ static int sun3scsi_detect(Scsi_Host_Template * tpnt) ...@@ -277,17 +277,15 @@ static int sun3scsi_detect(Scsi_Host_Template * tpnt)
return 1; return 1;
} }
#ifdef MODULE
int sun3scsi_release (struct Scsi_Host *shpnt) int sun3scsi_release (struct Scsi_Host *shpnt)
{ {
if (shpnt->irq != SCSI_IRQ_NONE) if (shpnt->irq != SCSI_IRQ_NONE)
free_irq (shpnt->irq, NULL); free_irq (shpnt->irq, NULL);
iounmap(sun3_scsi_regp); iounmap((void *)sun3_scsi_regp);
return 0; return 0;
} }
#endif
#ifdef RESET_BOOT #ifdef RESET_BOOT
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment