Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 951784b6 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove IDE_HFLAG_CY82C693 host flag 



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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent cb5528ab

drivers/ide/ide-dma.c

+2 −8
Original line number Diff line number Diff line
@@ -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

	if (!speed)

		return 0;

	}



	if (hwif->host_flags & IDE_HFLAG_NO_SET_MODE)

		return 1;

drivers/ide/pci/cy82c693.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

include/linux/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */