aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-12-18 02:33:05 -0500
committerJeff Garzik <jeff@garzik.org>2008-01-23 05:24:12 -0500
commita0f79b929acaba10d4780acd2543eff20bf4b5b0 (patch)
treee637c1d9388a3991cd71c5be339c2ead59c460a2 /include
parent5df91a25df08d85700fef5fd59bb1873273e5ef5 (diff)
libata: implement ata_timing_cycle2mode() and use it in libata-acpi and pata_acpi
libata-acpi is using separate timing tables for transfer modes although libata-core has the complete ata_timing table. Implement ata_timing_cycle2mode() to look for matching mode given transfer type and cycle duration and use it in libata-acpi and pata_acpi to replace private timing tables. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/libata.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 8022e5b2224d..8ede93b5c7a6 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -941,6 +941,7 @@ extern int ata_timing_compute(struct ata_device *, unsigned short,
941extern void ata_timing_merge(const struct ata_timing *, 941extern void ata_timing_merge(const struct ata_timing *,
942 const struct ata_timing *, struct ata_timing *, 942 const struct ata_timing *, struct ata_timing *,
943 unsigned int); 943 unsigned int);
944extern u8 ata_timing_cycle2mode(unsigned int xfer_shift, int cycle);
944 945
945enum { 946enum {
946 ATA_TIMING_SETUP = (1 << 0), 947 ATA_TIMING_SETUP = (1 << 0),
@@ -961,10 +962,6 @@ enum {
961 962
962/* libata-acpi.c */ 963/* libata-acpi.c */
963#ifdef CONFIG_ATA_ACPI 964#ifdef CONFIG_ATA_ACPI
964extern const unsigned int ata_acpi_pio_cycle[7];
965extern const unsigned int ata_acpi_mwdma_cycle[5];
966extern const unsigned int ata_acpi_udma_cycle[7];
967
968static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap) 965static inline const struct ata_acpi_gtm *ata_acpi_init_gtm(struct ata_port *ap)
969{ 966{
970 if (ap->pflags & ATA_PFLAG_INIT_GTM_VALID) 967 if (ap->pflags & ATA_PFLAG_INIT_GTM_VALID)