diff options
Diffstat (limited to 'drivers/scsi/aic7xxx')
-rw-r--r-- | drivers/scsi/aic7xxx/Kconfig.aic79xx | 12 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/Kconfig.aic7xxx | 10 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 6 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.h | 2 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx.h | 5 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_core.c | 2 |
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 | |||
57 | or modify the assembler Makefile or the files it includes if your | 57 | or modify the assembler Makefile or the files it includes if your |
58 | build environment is different than that of the author. | 58 | build environment is different than that of the author. |
59 | 59 | ||
60 | config AIC79XX_ENABLE_RD_STRM | ||
61 | bool "Enable Read Streaming for All Targets" | ||
62 | depends on SCSI_AIC79XX | ||
63 | default n | ||
64 | help | ||
65 | Read Streaming is a U320 protocol option that should enhance | ||
66 | performance. Early U320 drive firmware actually performs slower | ||
67 | with read streaming enabled so it is disabled by default. Read | ||
68 | Streaming can be configured in much the same way as tagged queueing | ||
69 | using the "rd_strm" command line option. See | ||
70 | drivers/scsi/aic7xxx/README.aic79xx for details. | ||
71 | |||
72 | config AIC79XX_DEBUG_ENABLE | 60 | config AIC79XX_DEBUG_ENABLE |
73 | bool "Compile in Debugging Code" | 61 | bool "Compile in Debugging Code" |
74 | depends on SCSI_AIC79XX | 62 | 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 | |||
50 | 50 | ||
51 | Default: 5000 (5 seconds) | 51 | Default: 5000 (5 seconds) |
52 | 52 | ||
53 | config AIC7XXX_PROBE_EISA_VL | ||
54 | bool "Probe for EISA and VL AIC7XXX Adapters" | ||
55 | depends on SCSI_AIC7XXX && EISA | ||
56 | help | ||
57 | Probe for EISA and VLB Aic7xxx controllers. In many newer systems, | ||
58 | the invasive probes necessary to detect these controllers can cause | ||
59 | other devices to fail. For this reason, the non-PCI probe code is | ||
60 | disabled by default. The current value of this option can be "toggled" | ||
61 | via the no_probe kernel command line option. | ||
62 | |||
63 | config AIC7XXX_BUILD_FIRMWARE | 53 | config AIC7XXX_BUILD_FIRMWARE |
64 | bool "Build Adapter Firmware with Kernel Build" | 54 | bool "Build Adapter Firmware with Kernel Build" |
65 | depends on SCSI_AIC7XXX && !PREVENT_FIRMWARE_BUILD | 55 | 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*, | |||
363 | struct scsi_cmnd *); | 363 | struct scsi_cmnd *); |
364 | static void ahd_linux_setup_tag_info_global(char *p); | 364 | static void ahd_linux_setup_tag_info_global(char *p); |
365 | static int aic79xx_setup(char *c); | 365 | static int aic79xx_setup(char *c); |
366 | static void ahd_freeze_simq(struct ahd_softc *ahd); | ||
367 | static void ahd_release_simq(struct ahd_softc *ahd); | ||
366 | 368 | ||
367 | static int ahd_linux_unit; | 369 | static int ahd_linux_unit; |
368 | 370 | ||
@@ -2016,13 +2018,13 @@ ahd_linux_queue_cmd_complete(struct ahd_softc *ahd, struct scsi_cmnd *cmd) | |||
2016 | cmd->scsi_done(cmd); | 2018 | cmd->scsi_done(cmd); |
2017 | } | 2019 | } |
2018 | 2020 | ||
2019 | void | 2021 | static void |
2020 | ahd_freeze_simq(struct ahd_softc *ahd) | 2022 | ahd_freeze_simq(struct ahd_softc *ahd) |
2021 | { | 2023 | { |
2022 | scsi_block_requests(ahd->platform_data->host); | 2024 | scsi_block_requests(ahd->platform_data->host); |
2023 | } | 2025 | } |
2024 | 2026 | ||
2025 | void | 2027 | static void |
2026 | ahd_release_simq(struct ahd_softc *ahd) | 2028 | ahd_release_simq(struct ahd_softc *ahd) |
2027 | { | 2029 | { |
2028 | scsi_unblock_requests(ahd->platform_data->host); | 2030 | 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); | |||
837 | void ahd_platform_free(struct ahd_softc *ahd); | 837 | void ahd_platform_free(struct ahd_softc *ahd); |
838 | void ahd_platform_init(struct ahd_softc *ahd); | 838 | void ahd_platform_init(struct ahd_softc *ahd); |
839 | void ahd_platform_freeze_devq(struct ahd_softc *ahd, struct scb *scb); | 839 | void ahd_platform_freeze_devq(struct ahd_softc *ahd, struct scb *scb); |
840 | void ahd_freeze_simq(struct ahd_softc *ahd); | ||
841 | void ahd_release_simq(struct ahd_softc *ahd); | ||
842 | 840 | ||
843 | static __inline void | 841 | static __inline void |
844 | ahd_freeze_scb(struct scb *scb) | 842 | 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 { | |||
1278 | AHC_QUEUE_TAGGED | 1278 | AHC_QUEUE_TAGGED |
1279 | } ahc_queue_alg; | 1279 | } ahc_queue_alg; |
1280 | 1280 | ||
1281 | void ahc_set_tags(struct ahc_softc *ahc, | ||
1282 | struct scsi_cmnd *cmd, | ||
1283 | struct ahc_devinfo *devinfo, | ||
1284 | ahc_queue_alg alg); | ||
1285 | |||
1286 | /**************************** Target Mode *************************************/ | 1281 | /**************************** Target Mode *************************************/ |
1287 | #ifdef AHC_TARGET_MODE | 1282 | #ifdef AHC_TARGET_MODE |
1288 | void ahc_send_lstate_events(struct ahc_softc *, | 1283 | 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, | |||
2073 | /* | 2073 | /* |
2074 | * Update the current state of tagged queuing for a given target. | 2074 | * Update the current state of tagged queuing for a given target. |
2075 | */ | 2075 | */ |
2076 | void | 2076 | static void |
2077 | ahc_set_tags(struct ahc_softc *ahc, struct scsi_cmnd *cmd, | 2077 | ahc_set_tags(struct ahc_softc *ahc, struct scsi_cmnd *cmd, |
2078 | struct ahc_devinfo *devinfo, ahc_queue_alg alg) | 2078 | struct ahc_devinfo *devinfo, ahc_queue_alg alg) |
2079 | { | 2079 | { |