lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] libata: use xfer_mask helpers in ata_dev_set_mode()

Browse Source 
Rewrite hardcoded xfer_mode string determination in ata_dev_set_mode()
using xfer_mask helpers.

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:57 +09:00
committed by Jeff Garzik
parent ff8854b271
commit 23e71c3d3e
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1752,9 +1752,6 @@ static u8 base_from_shift(unsigned int shift)
static void ata_dev_set_mode(struct ata_port *ap, struct ata_device *dev) static void ata_dev_set_mode(struct ata_port *ap, struct ata_device *dev)
{ {
int ofs, idx;
u8 base;
if (!ata_dev_present(dev) || (ap->flags & ATA_FLAG_PORT_DISABLED)) if (!ata_dev_present(dev) || (ap->flags & ATA_FLAG_PORT_DISABLED))
return; return;
@@ -1763,22 +1760,18 @@ static void ata_dev_set_mode(struct ata_port *ap, struct ata_device *dev)
ata_dev_set_xfermode(ap, dev); ata_dev_set_xfermode(ap, dev);
base = base_from_shift(dev->xfer_shift);
ofs = dev->xfer_mode - base;
idx = ofs + dev->xfer_shift;
WARN_ON(idx >= ARRAY_SIZE(xfer_mode_str));
if (ata_dev_revalidate(ap, dev, 0)) { if (ata_dev_revalidate(ap, dev, 0)) {
printk(KERN_ERR "ata%u: failed to revalidate after set " printk(KERN_ERR "ata%u: failed to revalidate after set "
"xfermode, disabled\n", ap->id); "xfermode, disabled\n", ap->id);
ata_port_disable(ap); ata_port_disable(ap);
} }
DPRINTK("idx=%d xfer_shift=%u, xfer_mode=0x%x, base=0x%x, offset=%d\n", DPRINTK("xfer_shift=%u, xfer_mode=0x%x\n",
idx, dev->xfer_shift, (int)dev->xfer_mode, (int)base, ofs); dev->xfer_shift, (int)dev->xfer_mode);
printk(KERN_INFO "ata%u: dev %u configured for %s\n", printk(KERN_INFO "ata%u: dev %u configured for %s\n",
ap->id, dev->devno, xfer_mode_str[idx]); ap->id, dev->devno,
ata_mode_string(ata_xfer_mode2mask(dev->xfer_mode)));
} }
static int ata_host_set_pio(struct ata_port *ap) static int ata_host_set_pio(struct ata_port *ap)