aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-09-02 23:31:58 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-12 14:55:39 -0400
commitdb6f8759d05d2082f09a45b5674edc0fb5e92b1b (patch)
tree68dd85f8cf6160249f52cdb99dbb2e2c47e0456f
parent2557164e0b18e78a7772632a2a90832f56181fc5 (diff)
libata: move ata_id_n_sectors() upward
Move ata_id_n_sectors() upward right below ata_id_c_string(). This is to accomodate later changes. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/ata/libata-core.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 2b222700d9bb..b33aea3638dc 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -821,6 +821,21 @@ void ata_id_c_string(const u16 *id, unsigned char *s,
821 *p = '\0'; 821 *p = '\0';
822} 822}
823 823
824static u64 ata_id_n_sectors(const u16 *id)
825{
826 if (ata_id_has_lba(id)) {
827 if (ata_id_has_lba48(id))
828 return ata_id_u64(id, 100);
829 else
830 return ata_id_u32(id, 60);
831 } else {
832 if (ata_id_current_chs_valid(id))
833 return ata_id_u32(id, 57);
834 else
835 return id[1] * id[3] * id[6];
836 }
837}
838
824static u64 ata_tf_to_lba48(struct ata_taskfile *tf) 839static u64 ata_tf_to_lba48(struct ata_taskfile *tf)
825{ 840{
826 u64 sectors = 0; 841 u64 sectors = 0;
@@ -1021,21 +1036,6 @@ static u64 ata_hpa_resize(struct ata_device *dev)
1021 return sectors; 1036 return sectors;
1022} 1037}
1023 1038
1024static u64 ata_id_n_sectors(const u16 *id)
1025{
1026 if (ata_id_has_lba(id)) {
1027 if (ata_id_has_lba48(id))
1028 return ata_id_u64(id, 100);
1029 else
1030 return ata_id_u32(id, 60);
1031 } else {
1032 if (ata_id_current_chs_valid(id))
1033 return ata_id_u32(id, 57);
1034 else
1035 return id[1] * id[3] * id[6];
1036 }
1037}
1038
1039/** 1039/**
1040 * ata_id_to_dma_mode - Identify DMA mode from id block 1040 * ata_id_to_dma_mode - Identify DMA mode from id block
1041 * @dev: device to identify 1041 * @dev: device to identify