1 files changed, 1 insertions, 13 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 7906d750aa77..8a7cc13c8516 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -140,7 +140,6 @@ enum {
 
         ATA_DFLAG_PIO           = (1 << 8), /* device limited to PIO mode */
         ATA_DFLAG_NCQ_OFF       = (1 << 9), /* device limited to non-NCQ mode */
-        ATA_DFLAG_SUSPENDED     = (1 << 10), /* device suspended */
         ATA_DFLAG_INIT_MASK     = (1 << 16) - 1,
 
         ATA_DFLAG_DETACH        = (1 << 16),
@@ -268,13 +267,9 @@ enum {
         ATA_EH_REVALIDATE       = (1 << 0),
         ATA_EH_SOFTRESET        = (1 << 1),
         ATA_EH_HARDRESET        = (1 << 2),
-        ATA_EH_SUSPEND          = (1 << 3),
-        ATA_EH_RESUME           = (1 << 4),
-        ATA_EH_PM_FREEZE        = (1 << 5),
 
         ATA_EH_RESET_MASK       = ATA_EH_SOFTRESET | ATA_EH_HARDRESET,
-        ATA_EH_PERDEV_MASK      = ATA_EH_REVALIDATE | ATA_EH_SUSPEND |
-                                  ATA_EH_RESUME | ATA_EH_PM_FREEZE,
+        ATA_EH_PERDEV_MASK      = ATA_EH_REVALIDATE,
 
         /* ata_eh_info->flags */
         ATA_EHI_HOTPLUGGED      = (1 << 0),  /* could have been hotplugged */
@@ -736,8 +731,6 @@ extern int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val);
 extern int ata_port_online(struct ata_port *ap);
 extern int ata_port_offline(struct ata_port *ap);
 #ifdef CONFIG_PM
-extern int ata_scsi_device_resume(struct scsi_device *);
-extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t mesg);
 extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg);
 extern void ata_host_resume(struct ata_host *host);
 #endif
@@ -1008,11 +1001,6 @@ static inline unsigned int ata_dev_absent(const struct ata_device *dev)
         return ata_class_absent(dev->class);
 }
 
-static inline unsigned int ata_dev_ready(const struct ata_device *dev)
-{
-        return ata_dev_enabled(dev) && !(dev->flags & ATA_DFLAG_SUSPENDED);
-}
-
 /*
  * port helpers
  */