aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata.h
diff options
context:
space:
mode:
authorAaron Lu <aaron.lu@intel.com>2013-08-27 14:07:12 -0400
committerTejun Heo <tj@kernel.org>2013-08-27 14:07:12 -0400
commit03f7b802b876904971f23f00f562061309e95e08 (patch)
treee378169bf31526d97a8aad46bc50628513d5adc9 /drivers/ata/libata.h
parent87fb6c31b9ef9ccab9a822b01fc3911f026a29bb (diff)
libata: acpi: Remove ata_dev_acpi_handle stub in libata.h
The ata_dev_acpi_handle is defined in libata-acpi.c and the only external user is libata-zpodd.c, which is built when CONFIG_ATA_ACPI is set, so there is no need to make an empty stub function for ONFIG_ATA_ACPI case in libata.h. It also causes compile errors due to acpi_handle is not defined when !CONFIG_ACPI. This patch fixes this problem by removing the empty stub. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Aaron Lu <aaron.lu@intel.com> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/libata.h')
-rw-r--r--drivers/ata/libata.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 3e9cc95a0222..eeeb77845d48 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -133,7 +133,6 @@ static inline void ata_acpi_set_state(struct ata_port *ap,
133 pm_message_t state) { } 133 pm_message_t state) { }
134static inline void ata_acpi_bind_port(struct ata_port *ap) {} 134static inline void ata_acpi_bind_port(struct ata_port *ap) {}
135static inline void ata_acpi_bind_dev(struct ata_device *dev) {} 135static inline void ata_acpi_bind_dev(struct ata_device *dev) {}
136static inline acpi_handle ata_dev_acpi_handle(struct ata_device *dev) { return NULL; }
137static inline void ata_scsi_acpi_bind(struct ata_device *dev) {} 136static inline void ata_scsi_acpi_bind(struct ata_device *dev) {}
138static inline void ata_scsi_acpi_unbind(struct ata_device *dev) {} 137static inline void ata_scsi_acpi_unbind(struct ata_device *dev) {}
139#endif 138#endif