diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:29 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 17:09:29 -0500 |
commit | d554336514a63342c2e4b06b4287ad93c112b00f (patch) | |
tree | 8a1e9f0b2db38ceaad8fa43669384fd9d8af5783 /drivers/ide/ide-floppy.c | |
parent | 7b9f25b539c3fa3c7b8c82775488a0021d90220f (diff) |
ide-{floppy,tape}: remove debug code for dumping identify data
IDE core supports dumping raw identify data in hdparm friendly format now
so verbose identify dumping in ide-{floppy,tape}.c device drivers (done iff
IDE{FLOPPY,TAPE}_DEBUG_INFO is defined to '1' and it is '0' by default)
is no longer nedeed.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index ff8232ef9659..cf48b4a46d6d 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -1658,7 +1658,6 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) | |||
1658 | { | 1658 | { |
1659 | struct idefloppy_id_gcw gcw; | 1659 | struct idefloppy_id_gcw gcw; |
1660 | #if IDEFLOPPY_DEBUG_INFO | 1660 | #if IDEFLOPPY_DEBUG_INFO |
1661 | u16 mask,i; | ||
1662 | char buffer[80]; | 1661 | char buffer[80]; |
1663 | #endif /* IDEFLOPPY_DEBUG_INFO */ | 1662 | #endif /* IDEFLOPPY_DEBUG_INFO */ |
1664 | 1663 | ||
@@ -1705,55 +1704,6 @@ static int idefloppy_identify_device (ide_drive_t *drive,struct hd_driveid *id) | |||
1705 | default: sprintf(buffer, "Reserved");break; | 1704 | default: sprintf(buffer, "Reserved");break; |
1706 | } | 1705 | } |
1707 | printk(KERN_INFO "Command Packet Size: %s\n", buffer); | 1706 | printk(KERN_INFO "Command Packet Size: %s\n", buffer); |
1708 | printk(KERN_INFO "Model: %.40s\n",id->model); | ||
1709 | printk(KERN_INFO "Firmware Revision: %.8s\n",id->fw_rev); | ||
1710 | printk(KERN_INFO "Serial Number: %.20s\n",id->serial_no); | ||
1711 | printk(KERN_INFO "Write buffer size(?): %d bytes\n",id->buf_size*512); | ||
1712 | printk(KERN_INFO "DMA: %s",id->capability & 0x01 ? "Yes\n":"No\n"); | ||
1713 | printk(KERN_INFO "LBA: %s",id->capability & 0x02 ? "Yes\n":"No\n"); | ||
1714 | printk(KERN_INFO "IORDY can be disabled: %s",id->capability & 0x04 ? "Yes\n":"No\n"); | ||
1715 | printk(KERN_INFO "IORDY supported: %s",id->capability & 0x08 ? "Yes\n":"Unknown\n"); | ||
1716 | printk(KERN_INFO "ATAPI overlap supported: %s",id->capability & 0x20 ? "Yes\n":"No\n"); | ||
1717 | printk(KERN_INFO "PIO Cycle Timing Category: %d\n",id->tPIO); | ||
1718 | printk(KERN_INFO "DMA Cycle Timing Category: %d\n",id->tDMA); | ||
1719 | printk(KERN_INFO "Single Word DMA supported modes:\n"); | ||
1720 | for (i=0,mask=1;i<8;i++,mask=mask << 1) { | ||
1721 | if (id->dma_1word & mask) | ||
1722 | printk(KERN_INFO " Mode %d%s\n", i, | ||
1723 | (id->dma_1word & (mask << 8)) ? " (active)" : ""); | ||
1724 | } | ||
1725 | printk(KERN_INFO "Multi Word DMA supported modes:\n"); | ||
1726 | for (i=0,mask=1;i<8;i++,mask=mask << 1) { | ||
1727 | if (id->dma_mword & mask) | ||
1728 | printk(KERN_INFO " Mode %d%s\n", i, | ||
1729 | (id->dma_mword & (mask << 8)) ? " (active)" : ""); | ||
1730 | } | ||
1731 | if (id->field_valid & 0x0002) { | ||
1732 | printk(KERN_INFO "Enhanced PIO Modes: %s\n", | ||
1733 | id->eide_pio_modes & 1 ? "Mode 3":"None"); | ||
1734 | if (id->eide_dma_min == 0) | ||
1735 | sprintf(buffer, "Not supported"); | ||
1736 | else | ||
1737 | sprintf(buffer, "%d ns",id->eide_dma_min); | ||
1738 | printk(KERN_INFO "Minimum Multi-word DMA cycle per word: %s\n", buffer); | ||
1739 | if (id->eide_dma_time == 0) | ||
1740 | sprintf(buffer, "Not supported"); | ||
1741 | else | ||
1742 | sprintf(buffer, "%d ns",id->eide_dma_time); | ||
1743 | printk(KERN_INFO "Manufacturer\'s Recommended Multi-word cycle: %s\n", buffer); | ||
1744 | if (id->eide_pio == 0) | ||
1745 | sprintf(buffer, "Not supported"); | ||
1746 | else | ||
1747 | sprintf(buffer, "%d ns",id->eide_pio); | ||
1748 | printk(KERN_INFO "Minimum PIO cycle without IORDY: %s\n", | ||
1749 | buffer); | ||
1750 | if (id->eide_pio_iordy == 0) | ||
1751 | sprintf(buffer, "Not supported"); | ||
1752 | else | ||
1753 | sprintf(buffer, "%d ns",id->eide_pio_iordy); | ||
1754 | printk(KERN_INFO "Minimum PIO cycle with IORDY: %s\n", buffer); | ||
1755 | } else | ||
1756 | printk(KERN_INFO "According to the device, fields 64-70 are not valid.\n"); | ||
1757 | #endif /* IDEFLOPPY_DEBUG_INFO */ | 1707 | #endif /* IDEFLOPPY_DEBUG_INFO */ |
1758 | 1708 | ||
1759 | if (gcw.protocol != 2) | 1709 | if (gcw.protocol != 2) |