mirror of https://gitee.com/openkylin/linux.git
ide: remove write-only ide_hwif_t.no_dsc flag
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
6679054895
commit
c1607e1af2
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue