diff options
| -rw-r--r-- | drivers/ide/cy82c693.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c index 74fc5401f407..d6e2cbbc53a0 100644 --- a/drivers/ide/cy82c693.c +++ b/drivers/ide/cy82c693.c | |||
| @@ -51,11 +51,6 @@ | |||
| 51 | #define DRV_NAME "cy82c693" | 51 | #define DRV_NAME "cy82c693" |
| 52 | 52 | ||
| 53 | /* | 53 | /* |
| 54 | * The following are used to debug the driver. | ||
| 55 | */ | ||
| 56 | #define CY82C693_DEBUG_INFO 0 | ||
| 57 | |||
| 58 | /* | ||
| 59 | * NOTE: the value for busmaster timeout is tricky and I got it by | 54 | * NOTE: the value for busmaster timeout is tricky and I got it by |
| 60 | * trial and error! By using a to low value will cause DMA timeouts | 55 | * trial and error! By using a to low value will cause DMA timeouts |
| 61 | * and drop IDE performance, and by using a to high value will cause | 56 | * and drop IDE performance, and by using a to high value will cause |
| @@ -176,11 +171,6 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode) | |||
| 176 | outb(index, CY82_INDEX_PORT); | 171 | outb(index, CY82_INDEX_PORT); |
| 177 | outb(data, CY82_DATA_PORT); | 172 | outb(data, CY82_DATA_PORT); |
| 178 | 173 | ||
| 179 | #if CY82C693_DEBUG_INFO | ||
| 180 | printk(KERN_INFO "%s (ch=%d, dev=%d): set DMA mode to %d (single=%d)\n", | ||
| 181 | drive->name, hwif->channel, drive->dn & 1, mode & 3, single); | ||
| 182 | #endif /* CY82C693_DEBUG_INFO */ | ||
| 183 | |||
| 184 | /* | 174 | /* |
| 185 | * note: below we set the value for Bus Master IDE TimeOut Register | 175 | * note: below we set the value for Bus Master IDE TimeOut Register |
| 186 | * I'm not absolutly sure what this does, but it solved my problem | 176 | * I'm not absolutly sure what this does, but it solved my problem |
| @@ -194,11 +184,6 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const u8 mode) | |||
| 194 | data = BUSMASTER_TIMEOUT; | 184 | data = BUSMASTER_TIMEOUT; |
| 195 | outb(CY82_INDEX_TIMEOUT, CY82_INDEX_PORT); | 185 | outb(CY82_INDEX_TIMEOUT, CY82_INDEX_PORT); |
| 196 | outb(data, CY82_DATA_PORT); | 186 | outb(data, CY82_DATA_PORT); |
| 197 | |||
| 198 | #if CY82C693_DEBUG_INFO | ||
| 199 | printk(KERN_INFO "%s: Set IDE Bus Master TimeOut Register to 0x%X\n", | ||
| 200 | drive->name, data); | ||
| 201 | #endif /* CY82C693_DEBUG_INFO */ | ||
| 202 | } | 187 | } |
| 203 | 188 | ||
| 204 | static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio) | 189 | static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio) |
| @@ -239,8 +224,6 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
| 239 | pci_write_config_byte(dev, CY82_IDE_MASTER_IOR, pclk.time_16r); | 224 | pci_write_config_byte(dev, CY82_IDE_MASTER_IOR, pclk.time_16r); |
| 240 | pci_write_config_byte(dev, CY82_IDE_MASTER_IOW, pclk.time_16w); | 225 | pci_write_config_byte(dev, CY82_IDE_MASTER_IOW, pclk.time_16w); |
| 241 | pci_write_config_byte(dev, CY82_IDE_MASTER_8BIT, pclk.time_8); | 226 | pci_write_config_byte(dev, CY82_IDE_MASTER_8BIT, pclk.time_8); |
| 242 | |||
| 243 | addrCtrl &= 0xF; | ||
| 244 | } else { | 227 | } else { |
| 245 | /* | 228 | /* |
| 246 | * set slave drive | 229 | * set slave drive |
| @@ -257,17 +240,7 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
| 257 | pci_write_config_byte(dev, CY82_IDE_SLAVE_IOR, pclk.time_16r); | 240 | pci_write_config_byte(dev, CY82_IDE_SLAVE_IOR, pclk.time_16r); |
| 258 | pci_write_config_byte(dev, CY82_IDE_SLAVE_IOW, pclk.time_16w); | 241 | pci_write_config_byte(dev, CY82_IDE_SLAVE_IOW, pclk.time_16w); |
| 259 | pci_write_config_byte(dev, CY82_IDE_SLAVE_8BIT, pclk.time_8); | 242 | pci_write_config_byte(dev, CY82_IDE_SLAVE_8BIT, pclk.time_8); |
| 260 | |||
| 261 | addrCtrl >>= 4; | ||
| 262 | addrCtrl &= 0xF; | ||
| 263 | } | 243 | } |
| 264 | |||
| 265 | #if CY82C693_DEBUG_INFO | ||
| 266 | printk(KERN_INFO "%s (ch=%d, dev=%d): set PIO timing to " | ||
| 267 | "(addr=0x%X, ior=0x%X, iow=0x%X, 8bit=0x%X)\n", | ||
| 268 | drive->name, hwif->channel, drive->dn & 1, | ||
| 269 | addrCtrl, pclk.time_16r, pclk.time_16w, pclk.time_8); | ||
| 270 | #endif /* CY82C693_DEBUG_INFO */ | ||
| 271 | } | 244 | } |
| 272 | 245 | ||
| 273 | static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) | 246 | static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) |
