Skip to content

Commit

Permalink
ide: remove IDE_HFLAG_CY82C693 host flag
Browse files Browse the repository at this point in the history
Sergei suggested that it shouldn't be necessary + it had no effect
anyway since ide_id_dma_bug() is called earlier in ide_tune_dma().

Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Apr 26, 2008
1 parent cb5528a commit 951784b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
10 changes: 2 additions & 8 deletions drivers/ide/ide-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -703,14 +703,8 @@ static int ide_tune_dma(ide_drive_t *drive)

speed = ide_max_dma_mode(drive);

if (!speed) {
/* is this really correct/needed? */
if ((hwif->host_flags & IDE_HFLAG_CY82C693) &&
ide_dma_good_drive(drive))
return 1;
else
return 0;
}
if (!speed)
return 0;

if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE)
return 1;
Expand Down
2 changes: 1 addition & 1 deletion drivers/ide/pci/cy82c693.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ static const struct ide_port_info cy82c693_chipset __devinitdata = {
.init_iops = init_iops_cy82c693,
.init_hwif = init_hwif_cy82c693,
.chipset = ide_cy82c693,
.host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_CY82C693,
.host_flags = IDE_HFLAG_SINGLE,
.pio_mask = ATA_PIO4,
.swdma_mask = ATA_SWDMA2,
.mwdma_mask = ATA_MWDMA2,
Expand Down
2 changes: 0 additions & 2 deletions include/linux/ide.h
Original file line number Diff line number Diff line change
Expand Up @@ -1085,8 +1085,6 @@ enum {
/* unmask IRQs */
IDE_HFLAG_UNMASK_IRQS = (1 << 25),
IDE_HFLAG_ABUSE_SET_DMA_MODE = (1 << 26),
/* host is CY82C693 */
IDE_HFLAG_CY82C693 = (1 << 27),
/* force host out of "simplex" mode */
IDE_HFLAG_CLEAR_SIMPLEX = (1 << 28),
/* DSC overlap is unsupported */
Expand Down

0 comments on commit 951784b

Please sign in to comment.