Commit db6f8759 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik

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: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 2557164e
...@@ -821,6 +821,21 @@ void ata_id_c_string(const u16 *id, unsigned char *s, ...@@ -821,6 +821,21 @@ void ata_id_c_string(const u16 *id, unsigned char *s,
*p = '\0'; *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) static u64 ata_tf_to_lba48(struct ata_taskfile *tf)
{ {
u64 sectors = 0; u64 sectors = 0;
...@@ -1021,21 +1036,6 @@ static u64 ata_hpa_resize(struct ata_device *dev) ...@@ -1021,21 +1036,6 @@ static u64 ata_hpa_resize(struct ata_device *dev)
return sectors; 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 * ata_id_to_dma_mode - Identify DMA mode from id block
* @dev: device to identify * @dev: device to identify
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment