diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2004-06-14 08:27:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2004-06-14 08:27:27 -0400 |
| commit | 77ca20f2f42b526733d7aa39fe41247dc5d4ce97 (patch) | |
| tree | c869d6c7f0eb3f104ba08c5d273c1ea328f616b2 /include | |
| parent | 8b08e769d08860b2d05ef9329a8bf9ee77cc977a (diff) | |
[libata] don't probe from workqueue
Since we want the probe phase to call other workqueues, this is
required to eliminate future deadlocks.
Other methods would include starting a single-shot thread just for
probing, but overall, using a separate thread for probing is pointless
since we are already in process context when we probe.
So, we simply call ata_bus_probe directly.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 18c90a0c1cfd..b2fd0adbe5b6 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -133,15 +133,6 @@ enum { BUS_IDENTIFY = 8, BUS_PACKET = 9, - /* thread states */ - THR_UNKNOWN = 0, - THR_PORT_RESET = (THR_UNKNOWN + 1), - THR_AWAIT_DEATH = (THR_PORT_RESET + 1), - THR_PROBE_FAILED = (THR_AWAIT_DEATH + 1), - THR_IDLE = (THR_PROBE_FAILED + 1), - THR_PROBE_SUCCESS = (THR_IDLE + 1), - THR_PROBE_START = (THR_PROBE_SUCCESS + 1), - /* SATA port states */ PORT_UNKNOWN = 0, PORT_ENABLED = 1, @@ -294,18 +285,12 @@ struct ata_port { struct ata_host_stats stats; struct ata_host_set *host_set; - struct semaphore probe_sem; - - unsigned int thr_state; - struct work_struct packet_task; struct work_struct pio_task; unsigned int pio_task_state; unsigned long pio_task_timeout; - struct work_struct probe_task; - void *private_data; }; |