UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] libata: separate out ata_id_major_version() 

Separate out ATA major version calculation from ata_dev_identify()
into ata_id_major_version().  It's preparation for splitting
ata_dev_identify().

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Tejun Heo 2006-02-12 22:47:04 +09:00 committed by Jeff Garzik
parent 2940740bca
commit 3d2ca91095
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/libata-core.c
View File

@ -927,7 +927,6 @@ static void ata_dev_identify(struct ata_port *ap, unsigned int device)
{ {
struct ata_device *dev = &ap->device[device]; struct ata_device *dev = &ap->device[device];
unsigned int major_version; unsigned int major_version;
u16 tmp;
unsigned long xfer_modes; unsigned long xfer_modes;
unsigned int using_edd; unsigned int using_edd;
struct ata_taskfile tf; struct ata_taskfile tf;
@ -1030,10 +1029,7 @@ retry:
goto err_out_nosup; goto err_out_nosup;
/* get major version */ /* get major version */
tmp = dev->id[ATA_ID_MAJOR_VER]; major_version = ata_id_major_version(dev->id);
for (major_version = 14; major_version >= 1; major_version--)
if (tmp & (1 << major_version))
break;
/* /*
* The exact sequence expected by certain pre-ATA4 drives is: * The exact sequence expected by certain pre-ATA4 drives is:

10
include/linux/ata.h
View File

@ -267,6 +267,16 @@ struct ata_taskfile {
((u64) (id)[(n) + 1] << 16) | \ ((u64) (id)[(n) + 1] << 16) | \
((u64) (id)[(n) + 0]) ) ((u64) (id)[(n) + 0]) )
static inline unsigned int ata_id_major_version(const u16 *id)
{
unsigned int mver;
for (mver = 14; mver >= 1; mver--)
if (id[ATA_ID_MAJOR_VER] & (1 << mver))
break;
return mver;
}
static inline int ata_id_current_chs_valid(const u16 *id) static inline int ata_id_current_chs_valid(const u16 *id)
{ {
/* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command