diff options
author | James Bottomley <James.Bottomley@steeleye.com> | 2005-05-16 17:39:38 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-20 16:54:34 -0400 |
commit | e4e360c325c90f7830baaa2a27cd7a1f2bdeb6b0 (patch) | |
tree | 238462ee734bd13cb6b7036b4dc207ecf57f3a48 /drivers/scsi/aic7xxx/aic7xxx_osm.h | |
parent | fad01ef88d2a27303757924c1fc013b31fe9a76b (diff) |
[SCSI] remove aic7xxx busyq
The aic7xxx driver has two spurious queues in it's linux glue code: the
busyq which queues incoming commands to the driver and the completeq
which queues finished commands before sending them back to the mid-layer
This patch just removes the busyq and makes the aic finally return the
correct status to get the mid-layer to manage its queueing, so a command
is either committed to the sequencer or returned to the midlayer for
requeue.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_osm.h')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h index ed9027bd8a40..956097035219 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h | |||
@@ -66,11 +66,11 @@ | |||
66 | #include <linux/pci.h> | 66 | #include <linux/pci.h> |
67 | #include <linux/smp_lock.h> | 67 | #include <linux/smp_lock.h> |
68 | #include <linux/version.h> | 68 | #include <linux/version.h> |
69 | #include <linux/interrupt.h> | ||
69 | #include <linux/module.h> | 70 | #include <linux/module.h> |
70 | #include <asm/byteorder.h> | 71 | #include <asm/byteorder.h> |
71 | #include <asm/io.h> | 72 | #include <asm/io.h> |
72 | 73 | ||
73 | #include <linux/interrupt.h> /* For tasklet support. */ | ||
74 | #include <linux/config.h> | 74 | #include <linux/config.h> |
75 | #include <linux/slab.h> | 75 | #include <linux/slab.h> |
76 | 76 | ||
@@ -341,7 +341,6 @@ typedef enum { | |||
341 | struct ahc_linux_target; | 341 | struct ahc_linux_target; |
342 | struct ahc_linux_device { | 342 | struct ahc_linux_device { |
343 | TAILQ_ENTRY(ahc_linux_device) links; | 343 | TAILQ_ENTRY(ahc_linux_device) links; |
344 | struct ahc_busyq busyq; | ||
345 | 344 | ||
346 | /* | 345 | /* |
347 | * The number of transactions currently | 346 | * The number of transactions currently |
@@ -488,7 +487,6 @@ struct ahc_platform_data { | |||
488 | struct ahc_completeq completeq; | 487 | struct ahc_completeq completeq; |
489 | 488 | ||
490 | spinlock_t spin_lock; | 489 | spinlock_t spin_lock; |
491 | struct tasklet_struct runq_tasklet; | ||
492 | u_int qfrozen; | 490 | u_int qfrozen; |
493 | pid_t dv_pid; | 491 | pid_t dv_pid; |
494 | struct timer_list completeq_timer; | 492 | struct timer_list completeq_timer; |