lkml.org 
[lkml]   [2003]   [Sep]   [29]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateMon, 29 Sep 2003 10:39:07 +0200
FromGeert Uytterhoeven <>
Subject[PATCH 301] 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.

--- linux-2.6.0-test6/drivers/scsi/sun3_scsi.c	Tue Jul 29 18:19:12 2003
+++ linux-m68k-2.6.0-test6/drivers/scsi/sun3_scsi.c	Mon Sep  1 13:50:47 2003
@@ -308,7 +308,6 @@
 	return 1;
 }
 
-#ifdef MODULE
 int sun3scsi_release (struct Scsi_Host *shpnt)
 {
 	if (shpnt->irq != SCSI_IRQ_NONE)
@@ -318,7 +317,6 @@
 
 	return 0;
 }
-#endif
 
 #ifdef RESET_BOOT
 /*
--- linux-2.6.0-test6/drivers/scsi/sun3_scsi.h	Tue Sep  9 10:13:08 2003
+++ linux-m68k-2.6.0-test6/drivers/scsi/sun3_scsi.h	Tue Sep  9 14:57:07 2003
@@ -52,11 +52,7 @@
 static const char *sun3scsi_info (struct Scsi_Host *);
 static int sun3scsi_bus_reset(Scsi_Cmnd *);
 static int sun3scsi_queue_command (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
-#ifdef MODULE
 static int sun3scsi_release (struct Scsi_Host *);
-#else
-#define sun3scsi_release NULL
-#endif
 
 #ifndef CMD_PER_LUN
 #define CMD_PER_LUN 2
--- linux-2.6.0-test6/drivers/scsi/sun3_scsi_vme.c	Tue Jul 29 18:19:12 2003
+++ linux-m68k-2.6.0-test6/drivers/scsi/sun3_scsi_vme.c	Mon Sep  1 13:50:47 2003
@@ -140,7 +140,7 @@
  
 static int sun3scsi_detect(Scsi_Host_Template * tpnt)
 {
-	unsigned long ioaddr, irq;
+	unsigned long ioaddr, irq = 0;
 	static int called = 0;
 	struct Scsi_Host *instance;
 	int i;
@@ -277,17 +277,15 @@
 	return 1;
 }
 
-#ifdef MODULE
 int sun3scsi_release (struct Scsi_Host *shpnt)
 {
 	if (shpnt->irq != SCSI_IRQ_NONE)
 		free_irq (shpnt->irq, NULL);
 
-	iounmap(sun3_scsi_regp);
+	iounmap((void *)sun3_scsi_regp);
 
 	return 0;
 }
-#endif
 
 #ifdef RESET_BOOT
 /*
Gr{oetje,eeting}s,
						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:48    [from the cache]
©2003-2008