Commit c4e28a0c authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] clean up DMA reference, new style ONLYDISK

parent 6126ae47
...@@ -1274,9 +1274,7 @@ static ide_startstop_t cdrom_seek_intr (ide_drive_t *drive) ...@@ -1274,9 +1274,7 @@ static ide_startstop_t cdrom_seek_intr (ide_drive_t *drive)
* this condition is far too common, to bother * this condition is far too common, to bother
* users about it * users about it
*/ */
#if 0 /* printk("%s: disabled DSC seek overlap\n", drive->name);*/
printk("%s: disabled DSC seek overlap\n", drive->name);
#endif
drive->dsc_overlap = 0; drive->dsc_overlap = 0;
} }
} }
...@@ -2963,8 +2961,10 @@ int ide_cdrom_probe_capabilities (ide_drive_t *drive) ...@@ -2963,8 +2961,10 @@ int ide_cdrom_probe_capabilities (ide_drive_t *drive)
printk(", %dkB Cache", be16_to_cpu(cap.buffer_size)); printk(", %dkB Cache", be16_to_cpu(cap.buffer_size));
#ifdef CONFIG_BLK_DEV_IDEDMA
if (drive->using_dma) if (drive->using_dma)
(void) HWIF(drive)->ide_dma_verbose(drive); (void) HWIF(drive)->ide_dma_verbose(drive);
#endif /* CONFIG_BLK_DEV_IDEDMA */
printk("\n"); printk("\n");
return nslots; return nslots;
...@@ -3259,11 +3259,7 @@ static ide_driver_t ide_cdrom_driver = { ...@@ -3259,11 +3259,7 @@ static ide_driver_t ide_cdrom_driver = {
.version = IDECD_VERSION, .version = IDECD_VERSION,
.media = ide_cdrom, .media = ide_cdrom,
.busy = 0, .busy = 0,
#ifdef CONFIG_IDEDMA_ONLYDISK
.supports_dma = 0,
#else
.supports_dma = 1, .supports_dma = 1,
#endif
.supports_dsc_overlap = 1, .supports_dsc_overlap = 1,
.cleanup = ide_cdrom_cleanup, .cleanup = ide_cdrom_cleanup,
.do_request = ide_do_rw_cdrom, .do_request = ide_do_rw_cdrom,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment