diff options
| author | Tejun Heo <htejun@gmail.com> | 2007-09-03 12:31:58 +0900 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-12 14:55:39 -0400 |
| commit | db6f8759d05d2082f09a45b5674edc0fb5e92b1b (patch) | |
| tree | 68dd85f8cf6160249f52cdb99dbb2e2c47e0456f /drivers/ata/libata-core.c | |
| parent | 2557164e0b18e78a7772632a2a90832f56181fc5 (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>
Diffstat (limited to 'drivers/ata/libata-core.c')
| -rw-r--r-- | drivers/ata/libata-core.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 2b222700d9b..b33aea3638d 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, *p = '\0'; } +static u64 ata_id_n_sectors(const u16 *id) +{ + if (ata_id_has_lba(id)) { + if (ata_id_has_lba48(id)) + return ata_id_u64(id, 100); + else + return ata_id_u32(id, 60); + } else { + if (ata_id_current_chs_valid(id)) + return ata_id_u32(id, 57); + else + return id[1] * id[3] * id[6]; + } +} + static u64 ata_tf_to_lba48(struct ata_taskfile *tf) { u64 sectors = 0; @@ -1021,21 +1036,6 @@ static u64 ata_hpa_resize(struct ata_device *dev) return sectors; } -static u64 ata_id_n_sectors(const u16 *id) -{ - if (ata_id_has_lba(id)) { - if (ata_id_has_lba48(id)) - return ata_id_u64(id, 100); - else - return ata_id_u32(id, 60); - } else { - if (ata_id_current_chs_valid(id)) - return ata_id_u32(id, 57); - else - return id[1] * id[3] * id[6]; - } -} - /** * ata_id_to_dma_mode - Identify DMA mode from id block * @dev: device to identify |