Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream

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

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 53da442f892d166ed0c1825ee04d174c727e19e0..64f90e17e51d5a87f3aa997e664c132542ad8029 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -161,6 +161,8 @@ enum {
        ATA_DFLAG_DETACH        = (1 << 24),
        ATA_DFLAG_DETACHED      = (1 << 25),
 
+       ATA_DFLAG_DA            = (1 << 26), /* device supports Device Attention */
+
        ATA_DEV_UNKNOWN         = 0,    /* unknown device */
        ATA_DEV_ATA             = 1,    /* ATA device */
        ATA_DEV_ATA_UNSUP       = 2,    /* ATA device (unsupported) */
@@ -545,9 +547,6 @@ struct ata_host {
        struct mutex            eh_mutex;
        struct task_struct      *eh_owner;
 
-#ifdef CONFIG_ATA_ACPI
-       acpi_handle             acpi_handle;
-#endif
        struct ata_port         *simplex_claimed;       /* channel owning the DMA */
        struct ata_port         *ports[0];
 };
@@ -615,7 +614,6 @@ struct ata_device {
        struct scsi_device      *sdev;          /* attached SCSI device */
        void                    *private_data;
 #ifdef CONFIG_ATA_ACPI
-       acpi_handle             acpi_handle;
        union acpi_object       *gtf_cache;
        unsigned int            gtf_filter;
 #endif
@@ -797,7 +795,6 @@ struct ata_port {
        void                    *private_data;
 
 #ifdef CONFIG_ATA_ACPI
-       acpi_handle             acpi_handle;
        struct ata_acpi_gtm     __acpi_init_gtm; /* use ata_acpi_init_gtm() */
 #endif
        /* owned by EH */
@@ -1116,6 +1113,8 @@ int ata_acpi_stm(struct ata_port *ap, const struct ata_acpi_gtm *stm);
 int ata_acpi_gtm(struct ata_port *ap, struct ata_acpi_gtm *stm);
 unsigned long ata_acpi_gtm_xfermask(struct ata_device *dev,
                                    const struct ata_acpi_gtm *gtm);
+acpi_handle ata_ap_acpi_handle(struct ata_port *ap);
+acpi_handle ata_dev_acpi_handle(struct ata_device *dev);
 int ata_acpi_cbl_80wire(struct ata_port *ap, const struct ata_acpi_gtm *gtm);
 #else
 static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap)