1 files changed, 0 insertions, 51 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index d0dfeef55db5..de3a0050760a 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1257,23 +1257,6 @@ int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)
         return queue_depth;
 }
 
-/* XXX: for spindown warning */
-static void ata_delayed_done_timerfn(unsigned long arg)
-{
-        struct scsi_cmnd *scmd = (void *)arg;
-
-        scmd->scsi_done(scmd);
-}
-
-/* XXX: for spindown warning */
-static void ata_delayed_done(struct scsi_cmnd *scmd)
-{
-        static struct timer_list timer;
-
-        setup_timer(&timer, ata_delayed_done_timerfn, (unsigned long)scmd);
-        mod_timer(&timer, jiffies + 5 * HZ);
-}
-
 /**
  *      ata_scsi_start_stop_xlat - Translate SCSI START STOP UNIT command
  *      @qc: Storage for translated ATA taskfile
@@ -1338,32 +1321,6 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc)
                      system_entering_hibernation())
                         goto skip;
 
-                /* XXX: This is for backward compatibility, will be
-                 * removed.  Read Documentation/feature-removal-schedule.txt
-                 * for more info.
-                 */
-                if ((qc->dev->flags & ATA_DFLAG_SPUNDOWN) &&
-                    (system_state == SYSTEM_HALT ||
-                     system_state == SYSTEM_POWER_OFF)) {
-                        static unsigned long warned;
-
-                        if (!test_and_set_bit(0, &warned)) {
-                                ata_dev_printk(qc->dev, KERN_WARNING,
-                                        "DISK MIGHT NOT BE SPUN DOWN PROPERLY. "
-                                        "UPDATE SHUTDOWN UTILITY\n");
-                                ata_dev_printk(qc->dev, KERN_WARNING,
-                                        "For more info, visit "
-                                        "http://linux-ata.org/shutdown.html\n");
-
-                                /* ->scsi_done is not used, use it for
-                                 * delayed completion.
-                                 */
-                                scmd->scsi_done = qc->scsidone;
-                                qc->scsidone = ata_delayed_done;
-                        }
-                        goto skip;
-                }
-
                 /* Issue ATA STANDBY IMMEDIATE command */
                 tf->command = ATA_CMD_STANDBYNOW1;
         }
@@ -1764,14 +1721,6 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc)
                 }
         }
 
-        /* XXX: track spindown state for spindown skipping and warning */
-        if (unlikely(qc->tf.command == ATA_CMD_STANDBY ||
-                     qc->tf.command == ATA_CMD_STANDBYNOW1))
-                qc->dev->flags |= ATA_DFLAG_SPUNDOWN;
-        else if (likely(system_state != SYSTEM_HALT &&
-                        system_state != SYSTEM_POWER_OFF))
-                qc->dev->flags &= ~ATA_DFLAG_SPUNDOWN;
-
         if (need_sense && !ap->ops->error_handler)
                 ata_dump_status(ap->print_id, &qc->result_tf);