asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] libata: use ata_id_xfermask() in ata_dev_configure()

Browse source 
Replace quick & dirty max transfer mode determination in
ata_dev_configure() with ata_id_xfermask().  While at it, rename
xfer_modes variable to xfer_mask and make it unsigned int for
consistency.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Tejun Heo 2006-03-06 04:31:56 +09:00 committed by Jeff Garzik
parent cb95d562e4
commit ff8854b271
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/scsi/libata-core.c
View file

@ -1224,7 +1224,7 @@ static inline u8 ata_dev_knobble(const struct ata_port *ap,
static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev, static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
int print_info) int print_info)
{ {
unsigned long xfer_modes; unsigned int xfer_mask;
int i, rc; int i, rc;
if (!ata_dev_present(dev)) { if (!ata_dev_present(dev)) {
@ -1255,12 +1255,8 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
goto err_out_nosup; goto err_out_nosup;
} }
/* quick-n-dirty find max transfer mode; for printk only */ /* find max transfer mode; for printk only */
xfer_modes = dev->id[ATA_ID_UDMA_MODES]; xfer_mask = ata_id_xfermask(dev->id);
if (!xfer_modes)
xfer_modes = (dev->id[ATA_ID_MWDMA_MODES]) << ATA_SHIFT_MWDMA;
if (!xfer_modes)
xfer_modes = ata_pio_modes(dev);
ata_dump_id(dev->id); ata_dump_id(dev->id);
@ -1284,7 +1280,7 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
"max %s, %Lu sectors: %s\n", "max %s, %Lu sectors: %s\n",
ap->id, dev->devno, ap->id, dev->devno,
ata_id_major_version(dev->id), ata_id_major_version(dev->id),
ata_mode_string(xfer_modes), ata_mode_string(xfer_mask),
(unsigned long long)dev->n_sectors, (unsigned long long)dev->n_sectors,
lba_desc); lba_desc);
} else { } else {
@ -1308,7 +1304,7 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
"max %s, %Lu sectors: CHS %u/%u/%u\n", "max %s, %Lu sectors: CHS %u/%u/%u\n",
ap->id, dev->devno, ap->id, dev->devno,
ata_id_major_version(dev->id), ata_id_major_version(dev->id),
ata_mode_string(xfer_modes), ata_mode_string(xfer_mask),
(unsigned long long)dev->n_sectors, (unsigned long long)dev->n_sectors,
dev->cylinders, dev->heads, dev->sectors); dev->cylinders, dev->heads, dev->sectors);
} }
@ -1329,7 +1325,7 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
/* print device info to dmesg */ /* print device info to dmesg */
if (print_info) if (print_info)
printk(KERN_INFO "ata%u: dev %u ATAPI, max %s\n", printk(KERN_INFO "ata%u: dev %u ATAPI, max %s\n",
ap->id, dev->devno, ata_mode_string(xfer_modes)); ap->id, dev->devno, ata_mode_string(xfer_mask));
} }
ap->host->max_cmd_len = 0; ap->host->max_cmd_len = 0;