diff options
author | Hannes Reinecke <hare@suse.de> | 2006-03-08 06:56:14 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-12 10:01:13 -0500 |
commit | 7b22da38b64a32df20fdb7272deb7546045fccec (patch) | |
tree | df26d10b480b9da5e68397ad4d8c12a2e5c59fec /drivers/scsi/aic7xxx/aic79xx_osm.h | |
parent | a382dd7c13377c8ff98f6ec59f64355653fb507e (diff) |
[SCSI] aic79xx: remove qfrozen
This patch removes the need for platform_data->qfrozen.
We're now using complete() instead of semaphores thus
simplifying ahd_freeze_simq() quite a lot.
This also fixes some deadlocks in the recovery code (again).
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx_osm.h')
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h index 9cb10134510..599e3940db1 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.h +++ b/drivers/scsi/aic7xxx/aic79xx_osm.h | |||
@@ -381,15 +381,12 @@ struct ahd_platform_data { | |||
381 | struct scsi_target *starget[AHD_NUM_TARGETS]; | 381 | struct scsi_target *starget[AHD_NUM_TARGETS]; |
382 | 382 | ||
383 | spinlock_t spin_lock; | 383 | spinlock_t spin_lock; |
384 | u_int qfrozen; | 384 | struct completion *eh_done; |
385 | struct semaphore eh_sem; | ||
386 | struct Scsi_Host *host; /* pointer to scsi host */ | 385 | struct Scsi_Host *host; /* pointer to scsi host */ |
387 | #define AHD_LINUX_NOIRQ ((uint32_t)~0) | 386 | #define AHD_LINUX_NOIRQ ((uint32_t)~0) |
388 | uint32_t irq; /* IRQ for this adapter */ | 387 | uint32_t irq; /* IRQ for this adapter */ |
389 | uint32_t bios_address; | 388 | uint32_t bios_address; |
390 | uint32_t mem_busaddr; /* Mem Base Addr */ | 389 | uint32_t mem_busaddr; /* Mem Base Addr */ |
391 | #define AHD_SCB_UP_EH_SEM 0x1 | ||
392 | uint32_t flags; | ||
393 | }; | 390 | }; |
394 | 391 | ||
395 | /************************** OS Utility Wrappers *******************************/ | 392 | /************************** OS Utility Wrappers *******************************/ |