[PATCH] libata: kill unused pio_task and packet_task

Kill unused pio_task and packet_task.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 16a108d2f9a9132d57422c3185fe0f938860223b..2974438d3bb7cba629941a87d9f6fc9af39876d4 100644 (file)
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -796,71 +796,6 @@ void ata_port_flush_task(struct ata_port *ap)
        DPRINTK("EXIT\n");
 }
 
-static inline void
-ata_queue_packet_task(struct ata_port *ap)
-{
-       if (!(ap->flags & ATA_FLAG_FLUSH_PIO_TASK))
-               queue_work(ata_wq, &ap->packet_task);
-}
-
-static inline void
-ata_queue_pio_task(struct ata_port *ap)
-{
-       if (!(ap->flags & ATA_FLAG_FLUSH_PIO_TASK))
-               queue_work(ata_wq, &ap->pio_task);
-}
-
-static inline void
-ata_queue_delayed_pio_task(struct ata_port *ap, unsigned long delay)
-{
-       if (!(ap->flags & ATA_FLAG_FLUSH_PIO_TASK))
-               queue_delayed_work(ata_wq, &ap->pio_task, delay);
-}
-
-/**
- *     ata_flush_pio_tasks - Flush pio_task and packet_task
- *     @ap: the target ata_port
- *
- *     After this function completes, pio_task and packet_task are
- *     guranteed not to be running or scheduled.
- *
- *     LOCKING:
- *     Kernel thread context (may sleep)
- */
-
-static void ata_flush_pio_tasks(struct ata_port *ap)
-{
-       int tmp = 0;
-       unsigned long flags;
-
-       DPRINTK("ENTER\n");
-
-       spin_lock_irqsave(&ap->host_set->lock, flags);
-       ap->flags |= ATA_FLAG_FLUSH_PIO_TASK;
-       spin_unlock_irqrestore(&ap->host_set->lock, flags);
-
-       DPRINTK("flush #1\n");
-       flush_workqueue(ata_wq);
-
-       /*
-        * At this point, if a task is running, it's guaranteed to see
-        * the FLUSH flag; thus, it will never queue pio tasks again.
-        * Cancel and flush.
-        */
-       tmp |= cancel_delayed_work(&ap->pio_task);
-       tmp |= cancel_delayed_work(&ap->packet_task);
-       if (!tmp) {
-               DPRINTK("flush #2\n");
-               flush_workqueue(ata_wq);
-       }
-
-       spin_lock_irqsave(&ap->host_set->lock, flags);
-       ap->flags &= ~ATA_FLAG_FLUSH_PIO_TASK;
-       spin_unlock_irqrestore(&ap->host_set->lock, flags);
-
-       DPRINTK("EXIT\n");
-}
-
 void ata_qc_complete_internal(struct ata_queued_cmd *qc)
 {
        struct completion *waiting = qc->private_data;
@@ -3814,7 +3749,6 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc)
 
        DPRINTK("ENTER\n");
 
-       ata_flush_pio_tasks(ap);
        ap->hsm_task_state = HSM_ST_IDLE;
 
        spin_lock_irqsave(&host_set->lock, flags);
@@ -4693,8 +4627,6 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host,
        ap->last_ctl = 0xFF;
 
        INIT_WORK(&ap->port_task, NULL, NULL);
-       INIT_WORK(&ap->packet_task, atapi_packet_task, ap);
-       INIT_WORK(&ap->pio_task, ata_pio_task, ap);
        INIT_LIST_HEAD(&ap->eh_done_q);
 
        for (i = 0; i < ATA_MAX_DEVICES; i++)

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 3ad2570f663b849cbee40501233f41da6a7ec19c..9ad020ac859133ba7913965d8113e4da4968ffd3 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -390,9 +390,6 @@ struct ata_port {
 
        struct work_struct      port_task;
 
-       struct work_struct      packet_task;
-
-       struct work_struct      pio_task;
        unsigned int            hsm_task_state;
        unsigned long           pio_task_timeout;