rk: revert to v3.10

[firefly-linux-kernel-4.4.55.git] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 8e5d45fa83cfb71872527cc5a4e2887d50f406d9..eae7a053dc5141d062a80bb4055449520bac61cf 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -187,7 +187,6 @@ enum {
        ATA_LFLAG_SW_ACTIVITY   = (1 << 7), /* keep activity stats */
        ATA_LFLAG_NO_LPM        = (1 << 8), /* disable LPM on this link */
        ATA_LFLAG_RST_ONCE      = (1 << 9), /* limit recovery to one reset */
-       ATA_LFLAG_CHANGED       = (1 << 10), /* LPM state changed on this link */
 
        /* struct ata_port flags */
        ATA_FLAG_SLAVE_POSS     = (1 << 0), /* host supports slave dev */
@@ -290,12 +289,6 @@ enum {
         */
        ATA_TMOUT_PMP_SRST_WAIT = 5000,
 
-       /* When the LPM policy is set to ATA_LPM_MAX_POWER, there might
-        * be a spurious PHY event, so ignore the first PHY event that
-        * occurs within 10s after the policy change.
-        */
-       ATA_TMOUT_SPURIOUS_PHY  = 10000,
-
        /* ATA bus states */
        BUS_UNKNOWN             = 0,
        BUS_DMA                 = 1,
@@ -406,9 +399,6 @@ enum {
        ATA_HORKAGE_BROKEN_FPDMA_AA     = (1 << 15),    /* skip AA */
        ATA_HORKAGE_DUMP_ID     = (1 << 16),    /* dump IDENTIFY data */
        ATA_HORKAGE_MAX_SEC_LBA48 = (1 << 17),  /* Set max sects to 65535 */
-       ATA_HORKAGE_ATAPI_DMADIR = (1 << 18),   /* device requires dmadir */
-       ATA_HORKAGE_NOLPM       = (1 << 20),    /* don't use LPM */
-       ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21),  /* some WDs have broken LPM */
 
         /* DMA mask for user DMA control: User visible values; DO NOT
            renumber */
@@ -554,7 +544,6 @@ struct ata_host {
        struct device           *dev;
        void __iomem * const    *iomap;
        unsigned int            n_ports;
-       unsigned int            n_tags;                 /* nr of NCQ tags */
        void                    *private_data;
        struct ata_port_operations *ops;
        unsigned long           flags;
@@ -743,8 +732,6 @@ struct ata_link {
        struct ata_eh_context   eh_context;
 
        struct ata_device       device[ATA_MAX_DEVICES];
-
-       unsigned long           last_lpm_change; /* when last LPM change happened */
 };
 #define ATA_LINK_CLEAR_BEGIN           offsetof(struct ata_link, active_tag)
 #define ATA_LINK_CLEAR_END             offsetof(struct ata_link, device[0])
@@ -782,7 +769,6 @@ struct ata_port {
        unsigned long           qc_allocated;
        unsigned int            qc_active;
        int                     nr_active_links; /* #links with active qcs */
-       unsigned int            last_tag;       /* track next tag hw expects */
 
        struct ata_link         link;           /* host default link */
        struct ata_link         *slave_link;    /* see ata_slave_link_init() */
@@ -1094,7 +1080,6 @@ extern struct ata_device *ata_dev_pair(struct ata_device *adev);
 extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev);
 extern void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap);
 extern void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap, struct list_head *eh_q);
-extern bool sata_lpm_ignore_phy_events(struct ata_link *link);
 
 extern int ata_cable_40wire(struct ata_port *ap);
 extern int ata_cable_80wire(struct ata_port *ap);