aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-02-16 20:40:24 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-02-16 20:40:24 -0500
commitc1607e1af238b823a2158a18ff6c89144ce38c6c (patch)
tree75f51cbc38e306bbdb2f7eb4d1413991e4ee7948 /drivers/ide
parent6679054895f9b1dc676d14637306b297451f1ac0 (diff)
ide: remove write-only ide_hwif_t.no_dsc flag
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-cd.c8
-rw-r--r--drivers/ide/ide.c1
-rw-r--r--drivers/ide/pci/aec62xx.c4
-rw-r--r--drivers/ide/pci/hpt34x.c1
4 files changed, 1 insertions, 13 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index a2bde80b540..e6e350cdfbf 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)
3255 if (drive->autotune == IDE_TUNE_DEFAULT || 3255 if (drive->autotune == IDE_TUNE_DEFAULT ||
3256 drive->autotune == IDE_TUNE_AUTO) 3256 drive->autotune == IDE_TUNE_AUTO)
3257 drive->dsc_overlap = (drive->next != drive); 3257 drive->dsc_overlap = (drive->next != drive);
3258#if 0
3259 drive->dsc_overlap = (HWIF(drive)->no_dsc) ? 0 : 1;
3260 if (HWIF(drive)->no_dsc) {
3261 printk(KERN_INFO "ide-cd: %s: disabling DSC overlap\n",
3262 drive->name);
3263 drive->dsc_overlap = 0;
3264 }
3265#endif
3266 3258
3267 if (ide_cdrom_register(drive, nslots)) { 3259 if (ide_cdrom_register(drive, nslots)) {
3268 printk (KERN_ERR "%s: ide_cdrom_setup failed to register device with the cdrom driver.\n", drive->name); 3260 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 65eb095469b..15b13831ee1 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)
552 hwif->extra_ports = tmp_hwif->extra_ports; 552 hwif->extra_ports = tmp_hwif->extra_ports;
553 hwif->autodma = tmp_hwif->autodma; 553 hwif->autodma = tmp_hwif->autodma;
554 hwif->udma_four = tmp_hwif->udma_four; 554 hwif->udma_four = tmp_hwif->udma_four;
555 hwif->no_dsc = tmp_hwif->no_dsc;
556 555
557 hwif->hwif_data = tmp_hwif->hwif_data; 556 hwif->hwif_data = tmp_hwif->hwif_data;
558} 557}
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index d261bfbad22..cac12c38b94 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)
286 hwif->tuneproc = &aec62xx_tune_drive; 286 hwif->tuneproc = &aec62xx_tune_drive;
287 hwif->speedproc = &aec62xx_tune_chipset; 287 hwif->speedproc = &aec62xx_tune_chipset;
288 288
289 if (hwif->pci_dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) { 289 if (hwif->pci_dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF)
290 hwif->serialized = hwif->channel; 290 hwif->serialized = hwif->channel;
291 hwif->no_dsc = 1;
292 }
293 291
294 if (hwif->mate) 292 if (hwif->mate)
295 hwif->mate->serialized = hwif->serialized; 293 hwif->mate->serialized = hwif->serialized;
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 6707f3944d4..0de3b61cabe 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)
194 194
195 hwif->tuneproc = &hpt34x_tune_drive; 195 hwif->tuneproc = &hpt34x_tune_drive;
196 hwif->speedproc = &hpt34x_tune_chipset; 196 hwif->speedproc = &hpt34x_tune_chipset;
197 hwif->no_dsc = 1;
198 hwif->drives[0].autotune = 1; 197 hwif->drives[0].autotune = 1;
199 hwif->drives[1].autotune = 1; 198 hwif->drives[1].autotune = 1;
200 199