6 files changed, 5 insertions, 32 deletions

diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 911ea1756e55..5e6620f8dabc 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -57,18 +57,6 @@ config AIC79XX_BUILD_FIRMWARE
         or modify the assembler Makefile or the files it includes if your
         build environment is different than that of the author.
 
-config AIC79XX_ENABLE_RD_STRM
-        bool "Enable Read Streaming for All Targets"
-        depends on SCSI_AIC79XX
-        default n
-        help
-        Read Streaming is a U320 protocol option that should enhance
-        performance.  Early U320 drive firmware actually performs slower
-        with read streaming enabled so it is disabled by default.  Read
-        Streaming can be configured in much the same way as tagged queueing
-        using the "rd_strm" command line option.  See
-        drivers/scsi/aic7xxx/README.aic79xx for details.
-
 config AIC79XX_DEBUG_ENABLE
         bool "Compile in Debugging Code"
         depends on SCSI_AIC79XX
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index cd93f9a8611f..88da670a7915 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -50,16 +50,6 @@ config AIC7XXX_RESET_DELAY_MS
 
         Default: 5000 (5 seconds)
 
-config AIC7XXX_PROBE_EISA_VL
-        bool "Probe for EISA and VL AIC7XXX Adapters"
-        depends on SCSI_AIC7XXX && EISA
-        help
-        Probe for EISA and VLB Aic7xxx controllers.  In many newer systems,
-        the invasive probes necessary to detect these controllers can cause
-        other devices to fail.  For this reason, the non-PCI probe code is
-        disabled by default.  The current value of this option can be "toggled"
-        via the no_probe kernel command line option.
-
 config AIC7XXX_BUILD_FIRMWARE
         bool "Build Adapter Firmware with Kernel Build"
         depends on SCSI_AIC7XXX && !PREVENT_FIRMWARE_BUILD
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 2be03e975d97..6054881f21f1 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -363,6 +363,8 @@ static int ahd_linux_run_command(struct ahd_softc*,
                                  struct scsi_cmnd *);
 static void ahd_linux_setup_tag_info_global(char *p);
 static int  aic79xx_setup(char *c);
+static void ahd_freeze_simq(struct ahd_softc *ahd);
+static void ahd_release_simq(struct ahd_softc *ahd);
 
 static int ahd_linux_unit;
 
@@ -2016,13 +2018,13 @@ ahd_linux_queue_cmd_complete(struct ahd_softc *ahd, struct scsi_cmnd *cmd)
         cmd->scsi_done(cmd);
 }
 
-void
+static void
 ahd_freeze_simq(struct ahd_softc *ahd)
 {
         scsi_block_requests(ahd->platform_data->host);
 }
 
-void
+static void
 ahd_release_simq(struct ahd_softc *ahd)
 {
         scsi_unblock_requests(ahd->platform_data->host);
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 147c83c456a5..9218f29314fa 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -837,8 +837,6 @@ int	ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg);
 void    ahd_platform_free(struct ahd_softc *ahd);
 void    ahd_platform_init(struct ahd_softc *ahd);
 void    ahd_platform_freeze_devq(struct ahd_softc *ahd, struct scb *scb);
-void    ahd_freeze_simq(struct ahd_softc *ahd);
-void    ahd_release_simq(struct ahd_softc *ahd);
 
 static __inline void
 ahd_freeze_scb(struct scb *scb)
diff --git a/drivers/scsi/aic7xxx/aic7xxx.h b/drivers/scsi/aic7xxx/aic7xxx.h
index 954c7c24501d..e1bd57b9f23d 100644
--- a/drivers/scsi/aic7xxx/aic7xxx.h
+++ b/drivers/scsi/aic7xxx/aic7xxx.h
@@ -1278,11 +1278,6 @@ typedef enum {
         AHC_QUEUE_TAGGED
 } ahc_queue_alg;
 
-void                    ahc_set_tags(struct ahc_softc *ahc,
-                                     struct scsi_cmnd *cmd,
-                                     struct ahc_devinfo *devinfo,
-                                     ahc_queue_alg alg);
-
 /**************************** Target Mode *************************************/
 #ifdef AHC_TARGET_MODE
 void            ahc_send_lstate_events(struct ahc_softc *,
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index 50ef785224de..75733b09f27a 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -2073,7 +2073,7 @@ ahc_set_width(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
 /*
  * Update the current state of tagged queuing for a given target.
  */
-void
+static void
 ahc_set_tags(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
              struct ahc_devinfo *devinfo, ahc_queue_alg alg)
 {