Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

Pull libata updates from Jeff Garzik:
 "Notable changes:

   - Updating libata to directly bind with ACPI / runtime power mgmt.
     This is a pre-req for SATA ZPODD (CD-ROM power management).

     Touches ACPI (exports++) and SCSI in minor ways.  Has been in
     linux-next for weeks.

     The rest of this should come via SCSI tree, as it involves a lot of
     updates to the 'sr' driver etc.

  Other, minor changes:

   - module_pci_driver() removes a lot of common boilerplate from each
     PCI driver

   - minor coding style, whitespace cleanups

   - pata_pcmcia bug fix, caught by Coccinelle

   - pata_imx, sata_dwc_460ex minor vendor updates

   - ahci_platform: use simple PM ops, and thereby add hibernation cb's

   - Add a few device-specific quirks"

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (23 commits)
  [libata] pata_cmd64x: whitespace cleanup
  libata-acpi: fix up for acpi_pm_device_sleep_state API
  sata_dwc_460ex: device tree may specify dma_channel
  ahci, trivial: fixed coding style issues related to braces
  ahci_platform: add hibernation callbacks
  libata-eh.c: local functions should not be exposed globally
  libata-transport.c: local functions should not be exposed globally
  sata_dwc_460ex: support hardreset
  ata: use module_pci_driver
  drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
  pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
  ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
  [libata] Prevent interface errors with Seagate FreeAgent GoFlex
  drivers/acpi/glue: revert accidental license-related 6b66d95895c bits
  libata-acpi: add missing inlines in libata.h
  libata: tell scsi layer device supports runtime power off
  libata: detect Device Attention support
  libata-acpi: register/unregister device to/from power resource
  libata-acpi: add ata port runtime D3Cold support
  libata-acpi: set acpi state for SATA port
  ...

1 files changed, 4 insertions, 5 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 53da442f892d..64f90e17e51d 100644
--- 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)