diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx.h | 3 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_core.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx.h b/drivers/scsi/aic7xxx/aic79xx.h index 170a4344cbb2..27adbb294ac1 100644 --- a/drivers/scsi/aic7xxx/aic79xx.h +++ b/drivers/scsi/aic7xxx/aic79xx.h | |||
@@ -1337,9 +1337,6 @@ int ahd_pci_test_register_access(struct ahd_softc *); | |||
1337 | /************************** SCB and SCB queue management **********************/ | 1337 | /************************** SCB and SCB queue management **********************/ |
1338 | void ahd_qinfifo_requeue_tail(struct ahd_softc *ahd, | 1338 | void ahd_qinfifo_requeue_tail(struct ahd_softc *ahd, |
1339 | struct scb *scb); | 1339 | struct scb *scb); |
1340 | int ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, | ||
1341 | int target, char channel, int lun, | ||
1342 | u_int tag, role_t role); | ||
1343 | 1340 | ||
1344 | /****************************** Initialization ********************************/ | 1341 | /****************************** Initialization ********************************/ |
1345 | struct ahd_softc *ahd_alloc(void *platform_arg, char *name); | 1342 | struct ahd_softc *ahd_alloc(void *platform_arg, char *name); |
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c index 07a86a30f676..9ddc6e4a74b0 100644 --- a/drivers/scsi/aic7xxx/aic79xx_core.c +++ b/drivers/scsi/aic7xxx/aic79xx_core.c | |||
@@ -262,6 +262,9 @@ static void ahd_update_coalescing_values(struct ahd_softc *ahd, | |||
262 | u_int mincmds); | 262 | u_int mincmds); |
263 | static int ahd_verify_vpd_cksum(struct vpd_config *vpd); | 263 | static int ahd_verify_vpd_cksum(struct vpd_config *vpd); |
264 | static int ahd_wait_seeprom(struct ahd_softc *ahd); | 264 | static int ahd_wait_seeprom(struct ahd_softc *ahd); |
265 | static int ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, | ||
266 | int target, char channel, int lun, | ||
267 | u_int tag, role_t role); | ||
265 | 268 | ||
266 | /******************************** Private Inlines *****************************/ | 269 | /******************************** Private Inlines *****************************/ |
267 | 270 | ||
@@ -7256,7 +7259,7 @@ ahd_busy_tcl(struct ahd_softc *ahd, u_int tcl, u_int scbid) | |||
7256 | } | 7259 | } |
7257 | 7260 | ||
7258 | /************************** SCB and SCB queue management **********************/ | 7261 | /************************** SCB and SCB queue management **********************/ |
7259 | int | 7262 | static int |
7260 | ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, int target, | 7263 | ahd_match_scb(struct ahd_softc *ahd, struct scb *scb, int target, |
7261 | char channel, int lun, u_int tag, role_t role) | 7264 | char channel, int lun, u_int tag, role_t role) |
7262 | { | 7265 | { |