diff options
author | Matthew Garrett <mjg@redhat.com> | 2012-06-25 04:13:03 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2012-06-29 11:38:10 -0400 |
commit | 6b66d95895c149cbc04d4fac5a2f5477c543a8ae (patch) | |
tree | fbf0349878339b7104338af89be86d0f78bfee1a /drivers/ata/libata.h | |
parent | de50ada55b6b83b54b817911ec42dc590e1c1738 (diff) |
libata: bind the Linux device tree to the ACPI device tree
Associate the ACPI device tree and libata devices.
This patch uses the generic ACPI glue framework to do so.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Holger Macht <holger@homac.de>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata.h')
-rw-r--r-- | drivers/ata/libata.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 9d0fd0b71852..7f48b602b01b 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h | |||
@@ -107,6 +107,8 @@ extern const char *sata_spd_string(unsigned int spd); | |||
107 | extern int ata_port_probe(struct ata_port *ap); | 107 | extern int ata_port_probe(struct ata_port *ap); |
108 | extern void __ata_port_probe(struct ata_port *ap); | 108 | extern void __ata_port_probe(struct ata_port *ap); |
109 | 109 | ||
110 | #define to_ata_port(d) container_of(d, struct ata_port, tdev) | ||
111 | |||
110 | /* libata-acpi.c */ | 112 | /* libata-acpi.c */ |
111 | #ifdef CONFIG_ATA_ACPI | 113 | #ifdef CONFIG_ATA_ACPI |
112 | extern unsigned int ata_acpi_gtf_filter; | 114 | extern unsigned int ata_acpi_gtf_filter; |
@@ -119,6 +121,8 @@ extern void ata_acpi_on_resume(struct ata_port *ap); | |||
119 | extern int ata_acpi_on_devcfg(struct ata_device *dev); | 121 | extern int ata_acpi_on_devcfg(struct ata_device *dev); |
120 | extern void ata_acpi_on_disable(struct ata_device *dev); | 122 | extern void ata_acpi_on_disable(struct ata_device *dev); |
121 | extern void ata_acpi_set_state(struct ata_port *ap, pm_message_t state); | 123 | extern void ata_acpi_set_state(struct ata_port *ap, pm_message_t state); |
124 | extern int ata_acpi_register(void); | ||
125 | extern void ata_acpi_unregister(void); | ||
122 | #else | 126 | #else |
123 | static inline void ata_acpi_associate_sata_port(struct ata_port *ap) { } | 127 | static inline void ata_acpi_associate_sata_port(struct ata_port *ap) { } |
124 | static inline void ata_acpi_associate(struct ata_host *host) { } | 128 | static inline void ata_acpi_associate(struct ata_host *host) { } |
@@ -129,6 +133,8 @@ static inline int ata_acpi_on_devcfg(struct ata_device *dev) { return 0; } | |||
129 | static inline void ata_acpi_on_disable(struct ata_device *dev) { } | 133 | static inline void ata_acpi_on_disable(struct ata_device *dev) { } |
130 | static inline void ata_acpi_set_state(struct ata_port *ap, | 134 | static inline void ata_acpi_set_state(struct ata_port *ap, |
131 | pm_message_t state) { } | 135 | pm_message_t state) { } |
136 | static inline int ata_acpi_register(void) { return 0; } | ||
137 | static void ata_acpi_unregister(void) { } | ||
132 | #endif | 138 | #endif |
133 | 139 | ||
134 | /* libata-scsi.c */ | 140 | /* libata-scsi.c */ |