Skip to content

L
linux
Commit 8f7e2dea authored by Justin T. Gibbs's avatar Justin T. Gibbs
Browse files
Options

Aic7xxx and Aic79xx driver Update 

 o Fix style nits.
parent f02103cc
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 12 deletions
drivers/scsi/aic7xxx/aic79xx_osm.c
View file @ 8f7e2dea
/* /*
* Adaptec AIC79xx device driver for Linux. * Adaptec AIC79xx device driver for Linux.
* *
* $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#150 $ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm.c#153 $
* *
* -------------------------------------------------------------------------- * --------------------------------------------------------------------------
* Copyright (c) 1994-2000 Justin T. Gibbs. * Copyright (c) 1994-2000 Justin T. Gibbs.
...@@ -680,7 +680,6 @@ ahd_linux_run_complete_queue(struct ahd_softc *ahd) ...@@ -680,7 +680,6 @@ ahd_linux_run_complete_queue(struct ahd_softc *ahd)
with_errors++; with_errors++;
cmd->scsi_done(cmd); cmd->scsi_done(cmd);
} }
ahd_done_unlock(ahd, &done_flags); ahd_done_unlock(ahd, &done_flags);
return (acmd); return (acmd);
...@@ -1335,7 +1334,7 @@ ahd_linux_abort(Scsi_Cmnd *cmd) ...@@ -1335,7 +1334,7 @@ ahd_linux_abort(Scsi_Cmnd *cmd)
* Start by searching the device queue. If not found * Start by searching the device queue. If not found
* there, check the pending_scb list. If not found * there, check the pending_scb list. If not found
* at all, and the system wanted us to just abort the * at all, and the system wanted us to just abort the
* command return success. * command, return success.
*/ */
dev = ahd_linux_get_device(ahd, cmd->device->channel, dev = ahd_linux_get_device(ahd, cmd->device->channel,
cmd->device->id, cmd->device->lun, cmd->device->id, cmd->device->lun,
...@@ -4036,9 +4035,8 @@ ahd_linux_device_queue_depth(struct ahd_softc *ahd, ...@@ -4036,9 +4035,8 @@ ahd_linux_device_queue_depth(struct ahd_softc *ahd,
&& dev->scsi_device->tagged_supported != 0) { && dev->scsi_device->tagged_supported != 0) {
ahd_set_tags(ahd, &devinfo, AHD_QUEUE_TAGGED); ahd_set_tags(ahd, &devinfo, AHD_QUEUE_TAGGED);
printf("scsi%d:%c:%d:%d: Tagged Queuing enabled. Depth %d\n", ahd_print_devinfo(ahd, &devinfo);
ahd->platform_data->host->host_no, devinfo.channel, printf("Tagged Queuing enabled. Depth %d\n", tags);
devinfo.target, devinfo.lun, tags);
} else { } else {
ahd_set_tags(ahd, &devinfo, AHD_QUEUE_NONE); ahd_set_tags(ahd, &devinfo, AHD_QUEUE_NONE);
} }
...@@ -4231,7 +4229,7 @@ void ...@@ -4231,7 +4229,7 @@ void
ahd_platform_flushwork(struct ahd_softc *ahd) ahd_platform_flushwork(struct ahd_softc *ahd)
{ {
while (ahd_linux_run_complete_queue(ahd) != 0) while (ahd_linux_run_complete_queue(ahd) != NULL)
; ;
} }
......
drivers/scsi/aic7xxx/aic7xxx_osm.c
View file @ 8f7e2dea
/* /*
* Adaptec AIC7xxx device driver for Linux. * Adaptec AIC7xxx device driver for Linux.
* *
* $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#213 $ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic7xxx_osm.c#215 $
* *
* Copyright (c) 1994 John Aycock * Copyright (c) 1994 John Aycock
* The University of Calgary Department of Computer Science. * The University of Calgary Department of Computer Science.
...@@ -3659,9 +3659,8 @@ ahc_linux_device_queue_depth(struct ahc_softc *ahc, ...@@ -3659,9 +3659,8 @@ ahc_linux_device_queue_depth(struct ahc_softc *ahc,
&& dev->scsi_device->tagged_supported != 0) { && dev->scsi_device->tagged_supported != 0) {
ahc_set_tags(ahc, &devinfo, AHC_QUEUE_TAGGED); ahc_set_tags(ahc, &devinfo, AHC_QUEUE_TAGGED);
printf("scsi%d:%c:%d:%d: Tagged Queuing enabled. Depth %d\n", ahc_print_devinfo(ahc, &devinfo);
ahc->platform_data->host->host_no, devinfo.channel, printf("Tagged Queuing enabled. Depth %d\n", tags);
devinfo.target, devinfo.lun, tags);
} else { } else {
ahc_set_tags(ahc, &devinfo, AHC_QUEUE_NONE); ahc_set_tags(ahc, &devinfo, AHC_QUEUE_NONE);
} }
...@@ -4780,7 +4779,7 @@ ahc_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag) ...@@ -4780,7 +4779,7 @@ ahc_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag)
* Start by searching the device queue. If not found * Start by searching the device queue. If not found
* there, check the pending_scb list. If not found * there, check the pending_scb list. If not found
* at all, and the system wanted us to just abort the * at all, and the system wanted us to just abort the
* command return success. * command, return success.
*/ */
dev = ahc_linux_get_device(ahc, cmd->device->channel, cmd->device->id, dev = ahc_linux_get_device(ahc, cmd->device->channel, cmd->device->id,
cmd->device->lun, /*alloc*/FALSE); cmd->device->lun, /*alloc*/FALSE);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7