aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBorislav Petkov <bbpetkov@yahoo.de>2008-02-02 13:56:49 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-02 13:56:49 -0500
commitf79f93a2f32ed4df8ccbf82db2e8ad283ee60495 (patch)
tree8128843575893827d1bee2df85dae8c6d6ce1eda /drivers/ide
parent16422de3579d1debf0b502fc94cac6327db29c4d (diff)
ide-tape: remove IDETAPE_DEBUG_INFO
The device capabilities are probed for during device initialization so this info is available through proc/ioctl() und it is redundant here. Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-tape.c73
1 files changed, 0 insertions, 73 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index bbf60ee582bb..99084663a7c0 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -106,7 +106,6 @@ typedef struct os_dat_s {
106/* 106/*
107 * The following are used to debug the driver: 107 * The following are used to debug the driver:
108 * 108 *
109 * Setting IDETAPE_DEBUG_INFO to 1 will report device capabilities.
110 * Setting IDETAPE_DEBUG_LOG to 1 will log driver flow control. 109 * Setting IDETAPE_DEBUG_LOG to 1 will log driver flow control.
111 * Setting IDETAPE_DEBUG_BUGS to 1 will enable self-sanity checks in 110 * Setting IDETAPE_DEBUG_BUGS to 1 will enable self-sanity checks in
112 * some places. 111 * some places.
@@ -121,7 +120,6 @@ typedef struct os_dat_s {
121 * is verified to be stable enough. This will make it much more 120 * is verified to be stable enough. This will make it much more
122 * esthetic. 121 * esthetic.
123 */ 122 */
124#define IDETAPE_DEBUG_INFO 0
125#define IDETAPE_DEBUG_LOG 0 123#define IDETAPE_DEBUG_LOG 0
126#define IDETAPE_DEBUG_BUGS 1 124#define IDETAPE_DEBUG_BUGS 1
127 125
@@ -3815,41 +3813,6 @@ static int idetape_identify_device (ide_drive_t *drive)
3815 3813
3816 *((unsigned short *) &gcw) = id->config; 3814 *((unsigned short *) &gcw) = id->config;
3817 3815
3818#if IDETAPE_DEBUG_INFO
3819 printk(KERN_INFO "ide-tape: Dumping ATAPI Identify Device tape parameters\n");
3820 printk(KERN_INFO "ide-tape: Protocol Type: ");
3821 switch (gcw.protocol) {
3822 case 0: case 1: printk("ATA\n");break;
3823 case 2: printk("ATAPI\n");break;
3824 case 3: printk("Reserved (Unknown to ide-tape)\n");break;
3825 }
3826 printk(KERN_INFO "ide-tape: Device Type: %x - ",gcw.device_type);
3827 switch (gcw.device_type) {
3828 case 0: printk("Direct-access Device\n");break;
3829 case 1: printk("Streaming Tape Device\n");break;
3830 case 2: case 3: case 4: printk("Reserved\n");break;
3831 case 5: printk("CD-ROM Device\n");break;
3832 case 6: printk("Reserved\n");
3833 case 7: printk("Optical memory Device\n");break;
3834 case 0x1f: printk("Unknown or no Device type\n");break;
3835 default: printk("Reserved\n");
3836 }
3837 printk(KERN_INFO "ide-tape: Removable: %s",gcw.removable ? "Yes\n":"No\n");
3838 printk(KERN_INFO "ide-tape: Command Packet DRQ Type: ");
3839 switch (gcw.drq_type) {
3840 case 0: printk("Microprocessor DRQ\n");break;
3841 case 1: printk("Interrupt DRQ\n");break;
3842 case 2: printk("Accelerated DRQ\n");break;
3843 case 3: printk("Reserved\n");break;
3844 }
3845 printk(KERN_INFO "ide-tape: Command Packet Size: ");
3846 switch (gcw.packet_size) {
3847 case 0: printk("12 bytes\n");break;
3848 case 1: printk("16 bytes\n");break;
3849 default: printk("Reserved\n");break;
3850 }
3851#endif /* IDETAPE_DEBUG_INFO */
3852
3853 /* Check that we can support this device */ 3816 /* Check that we can support this device */
3854 3817
3855 if (gcw.protocol != 2) 3818 if (gcw.protocol != 2)
@@ -3938,38 +3901,6 @@ static void idetape_get_mode_sense_results (ide_drive_t *drive)
3938 tape->tape_block_size = 512; 3901 tape->tape_block_size = 512;
3939 else if (capabilities->blk1024) 3902 else if (capabilities->blk1024)
3940 tape->tape_block_size = 1024; 3903 tape->tape_block_size = 1024;
3941
3942#if IDETAPE_DEBUG_INFO
3943 printk(KERN_INFO "ide-tape: Dumping the results of the MODE SENSE packet command\n");
3944 printk(KERN_INFO "ide-tape: Mode Parameter Header:\n");
3945 printk(KERN_INFO "ide-tape: Mode Data Length - %d\n", pc.buffer[0]);
3946 printk(KERN_INFO "ide-tape: Medium Type - %d\n", pc.buffer[1]);
3947 printk(KERN_INFO "ide-tape: Device Specific Parameter - %d\n",
3948 pc.buffer[2]);
3949 printk(KERN_INFO "ide-tape: Block Descriptor Length - %d\n",
3950 pc.buffer[3]);
3951
3952 printk(KERN_INFO "ide-tape: Capabilities and Mechanical Status Page:\n");
3953 printk(KERN_INFO "ide-tape: Page code - %d\n",capabilities->page_code);
3954 printk(KERN_INFO "ide-tape: Page length - %d\n",capabilities->page_length);
3955 printk(KERN_INFO "ide-tape: Read only - %s\n",capabilities->ro ? "Yes":"No");
3956 printk(KERN_INFO "ide-tape: Supports reverse space - %s\n",capabilities->sprev ? "Yes":"No");
3957 printk(KERN_INFO "ide-tape: Supports erase initiated formatting - %s\n",capabilities->efmt ? "Yes":"No");
3958 printk(KERN_INFO "ide-tape: Supports QFA two Partition format - %s\n",capabilities->qfa ? "Yes":"No");
3959 printk(KERN_INFO "ide-tape: Supports locking the medium - %s\n",capabilities->lock ? "Yes":"No");
3960 printk(KERN_INFO "ide-tape: The volume is currently locked - %s\n",capabilities->locked ? "Yes":"No");
3961 printk(KERN_INFO "ide-tape: The device defaults in the prevent state - %s\n",capabilities->prevent ? "Yes":"No");
3962 printk(KERN_INFO "ide-tape: Supports ejecting the medium - %s\n",capabilities->eject ? "Yes":"No");
3963 printk(KERN_INFO "ide-tape: Supports error correction - %s\n",capabilities->ecc ? "Yes":"No");
3964 printk(KERN_INFO "ide-tape: Supports data compression - %s\n",capabilities->cmprs ? "Yes":"No");
3965 printk(KERN_INFO "ide-tape: Supports 512 bytes block size - %s\n",capabilities->blk512 ? "Yes":"No");
3966 printk(KERN_INFO "ide-tape: Supports 1024 bytes block size - %s\n",capabilities->blk1024 ? "Yes":"No");
3967 printk(KERN_INFO "ide-tape: Supports 32768 bytes block size / Restricted byte count for PIO transfers - %s\n",capabilities->blk32768 ? "Yes":"No");
3968 printk(KERN_INFO "ide-tape: Maximum supported speed in KBps - %d\n",capabilities->max_speed);
3969 printk(KERN_INFO "ide-tape: Continuous transfer limits in blocks - %d\n",capabilities->ctl);
3970 printk(KERN_INFO "ide-tape: Current speed in KBps - %d\n",capabilities->speed);
3971 printk(KERN_INFO "ide-tape: Buffer size - %d\n",capabilities->buffer_size*512);
3972#endif /* IDETAPE_DEBUG_INFO */
3973} 3904}
3974 3905
3975/* 3906/*
@@ -3995,10 +3926,6 @@ static void idetape_get_blocksize_from_block_descriptor(ide_drive_t *drive)
3995 block_descrp = (idetape_parameter_block_descriptor_t *)(pc.buffer + 4); 3926 block_descrp = (idetape_parameter_block_descriptor_t *)(pc.buffer + 4);
3996 tape->tape_block_size =( block_descrp->length[0]<<16) + (block_descrp->length[1]<<8) + block_descrp->length[2]; 3927 tape->tape_block_size =( block_descrp->length[0]<<16) + (block_descrp->length[1]<<8) + block_descrp->length[2];
3997 tape->drv_write_prot = (pc.buffer[2] & 0x80) >> 7; 3928 tape->drv_write_prot = (pc.buffer[2] & 0x80) >> 7;
3998
3999#if IDETAPE_DEBUG_INFO
4000 printk(KERN_INFO "ide-tape: Adjusted block size - %d\n", tape->tape_block_size);
4001#endif /* IDETAPE_DEBUG_INFO */
4002} 3929}
4003 3930
4004#ifdef CONFIG_IDE_PROC_FS 3931#ifdef CONFIG_IDE_PROC_FS