5 files changed, 1 insertions, 14 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index a2bde80b5402..e6e350cdfbf9 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -3255,14 +3255,6 @@ int ide_cdrom_setup (ide_drive_t *drive)
         if (drive->autotune == IDE_TUNE_DEFAULT ||
             drive->autotune == IDE_TUNE_AUTO)
                 drive->dsc_overlap = (drive->next != drive);
-#if 0
-        drive->dsc_overlap = (HWIF(drive)->no_dsc) ? 0 : 1;
-        if (HWIF(drive)->no_dsc) {
-                printk(KERN_INFO "ide-cd: %s: disabling DSC overlap\n",
-                        drive->name);
-                drive->dsc_overlap = 0;
-        }
-#endif
 
         if (ide_cdrom_register(drive, nslots)) {
                 printk (KERN_ERR "%s: ide_cdrom_setup failed to register device with the cdrom driver.\n", drive->name);
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 65eb095469b5..15b13831ee14 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -552,7 +552,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->extra_ports               = tmp_hwif->extra_ports;
         hwif->autodma                   = tmp_hwif->autodma;
         hwif->udma_four                 = tmp_hwif->udma_four;
-        hwif->no_dsc                    = tmp_hwif->no_dsc;
 
         hwif->hwif_data                 = tmp_hwif->hwif_data;
 }
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index d261bfbad222..cac12c38b940 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -286,10 +286,8 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
         hwif->tuneproc = &aec62xx_tune_drive;
         hwif->speedproc = &aec62xx_tune_chipset;
 
-        if (hwif->pci_dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) {
+        if (hwif->pci_dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF)
                 hwif->serialized = hwif->channel;
-                hwif->no_dsc = 1;
-        }
 
         if (hwif->mate)
                 hwif->mate->serialized = hwif->serialized;
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 6707f3944d44..0de3b61cabe3 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -194,7 +194,6 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif)
 
         hwif->tuneproc = &hpt34x_tune_drive;
         hwif->speedproc = &hpt34x_tune_chipset;
-        hwif->no_dsc = 1;
         hwif->drives[0].autotune = 1;
         hwif->drives[1].autotune = 1;
 
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 59bb58096942..606cef727c5a 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -803,7 +803,6 @@ typedef struct hwif_s {
         unsigned        udma_four  : 1; /* 1=ATA-66 capable, 0=default */
         unsigned        no_lba48   : 1; /* 1 = cannot do LBA48 */
         unsigned        no_lba48_dma : 1; /* 1 = cannot do LBA48 DMA */
-        unsigned        no_dsc     : 1; /* 0 default, 1 dsc_overlap disabled */
         unsigned        auto_poll  : 1; /* supports nop auto-poll */
         unsigned        sg_mapped  : 1; /* sg_table and sg_nents are ready */
         unsigned        no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */