aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.c5
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_osm.h2
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index ff2a212c6e9..d0c71da58e8 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -1332,7 +1332,6 @@ ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg)
1332 return (ENOMEM); 1332 return (ENOMEM);
1333 memset(ahc->platform_data, 0, sizeof(struct ahc_platform_data)); 1333 memset(ahc->platform_data, 0, sizeof(struct ahc_platform_data));
1334 TAILQ_INIT(&ahc->platform_data->completeq); 1334 TAILQ_INIT(&ahc->platform_data->completeq);
1335 TAILQ_INIT(&ahc->platform_data->device_runq);
1336 ahc->platform_data->irq = AHC_LINUX_NOIRQ; 1335 ahc->platform_data->irq = AHC_LINUX_NOIRQ;
1337 ahc_lockinit(ahc); 1336 ahc_lockinit(ahc);
1338 init_timer(&ahc->platform_data->completeq_timer); 1337 init_timer(&ahc->platform_data->completeq_timer);
@@ -2107,10 +2106,6 @@ ahc_done(struct ahc_softc *ahc, struct scb *scb)
2107 && dev->active == 0 2106 && dev->active == 0
2108 && (dev->flags & AHC_DEV_TIMER_ACTIVE) == 0) 2107 && (dev->flags & AHC_DEV_TIMER_ACTIVE) == 0)
2109 ahc_linux_free_device(ahc, dev); 2108 ahc_linux_free_device(ahc, dev);
2110 else if ((dev->flags & AHC_DEV_ON_RUN_LIST) == 0) {
2111 TAILQ_INSERT_TAIL(&ahc->platform_data->device_runq, dev, links);
2112 dev->flags |= AHC_DEV_ON_RUN_LIST;
2113 }
2114 2109
2115 if ((scb->flags & SCB_RECOVERY_SCB) != 0) { 2110 if ((scb->flags & SCB_RECOVERY_SCB) != 0) {
2116 printf("Recovery SCB completes\n"); 2111 printf("Recovery SCB completes\n");
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h
index 2afd0521c4a..9ce7639dc73 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.h
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h
@@ -325,7 +325,6 @@ typedef enum {
325 AHC_DEV_UNCONFIGURED = 0x01, 325 AHC_DEV_UNCONFIGURED = 0x01,
326 AHC_DEV_FREEZE_TIL_EMPTY = 0x02, /* Freeze queue until active == 0 */ 326 AHC_DEV_FREEZE_TIL_EMPTY = 0x02, /* Freeze queue until active == 0 */
327 AHC_DEV_TIMER_ACTIVE = 0x04, /* Our timer is active */ 327 AHC_DEV_TIMER_ACTIVE = 0x04, /* Our timer is active */
328 AHC_DEV_ON_RUN_LIST = 0x08, /* Queued to be run later */
329 AHC_DEV_Q_BASIC = 0x10, /* Allow basic device queuing */ 328 AHC_DEV_Q_BASIC = 0x10, /* Allow basic device queuing */
330 AHC_DEV_Q_TAGGED = 0x20, /* Allow full SCSI2 command queueing */ 329 AHC_DEV_Q_TAGGED = 0x20, /* Allow full SCSI2 command queueing */
331 AHC_DEV_PERIODIC_OTAG = 0x40, /* Send OTAG to prevent starvation */ 330 AHC_DEV_PERIODIC_OTAG = 0x40, /* Send OTAG to prevent starvation */
@@ -466,7 +465,6 @@ struct ahc_platform_data {
466 * Fields accessed from interrupt context. 465 * Fields accessed from interrupt context.
467 */ 466 */
468 struct ahc_linux_target *targets[AHC_NUM_TARGETS]; 467 struct ahc_linux_target *targets[AHC_NUM_TARGETS];
469 TAILQ_HEAD(, ahc_linux_device) device_runq;
470 struct ahc_completeq completeq; 468 struct ahc_completeq completeq;
471 469
472 spinlock_t spin_lock; 470 spinlock_t spin_lock;