Skip to content

Commit

Permalink
libata: move ata_id_n_sectors() upward
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Oct 12, 2007
1 parent 2557164 commit db6f875
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions drivers/ata/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit db6f875

Please sign in to comment.