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

Commit e160124f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove IDE_HFLAG_NO_AUTOTUNE host flag 



* Don't set IDE_HFLAG_NO_AUTOTUNE host flag in sgiioc4 and icside
  host drivers - there is no need for it as they don't implement
  ->set_pio_mode method.

* Remove no longer needed IDE_HFLAG_NO_AUTOTUNE host flag.

There should be no functional changes caused by this patch.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent bdffe5d2

drivers/ide/arm/icside.c

+1 −2
Original line number Diff line number Diff line
@@ -480,8 +480,7 @@ static const struct ide_port_info icside_v6_port_info __initdata = { 
	.init_dma		= icside_dma_off_init,

	.port_ops		= &icside_v6_no_dma_port_ops,

	.dma_ops		= &icside_v6_dma_ops,

	.host_flags		= IDE_HFLAG_SERIALIZE |

				  IDE_HFLAG_NO_AUTOTUNE,

	.host_flags		= IDE_HFLAG_SERIALIZE,

	.mwdma_mask		= ATA_MWDMA2,

	.swdma_mask		= ATA_SWDMA2,

};

drivers/ide/ide-probe.c

+1 −2
Original line number Diff line number Diff line
@@ -1325,7 +1325,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif) 
			drive->unmask = 1;

		if (hwif->host_flags & IDE_HFLAG_NO_UNMASK_IRQS)

			drive->no_unmask = 1;

		if ((hwif->host_flags & IDE_HFLAG_NO_AUTOTUNE) == 0)

		drive->autotune = 1;

	}

drivers/ide/pci/sgiioc4.c

+0 −1
Original line number Diff line number Diff line
@@ -573,7 +573,6 @@ static const struct ide_port_info sgiioc4_port_info __devinitdata = { 
	.init_dma		= ide_dma_sgiioc4,

	.port_ops		= &sgiioc4_port_ops,

	.dma_ops		= &sgiioc4_dma_ops,

	.host_flags		= IDE_HFLAG_NO_AUTOTUNE,

	.mwdma_mask		= ATA_MWDMA2_ONLY,

};

include/linux/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -1063,8 +1063,6 @@ enum { 
	IDE_HFLAG_NO_DMA		= (1 << 14),

	/* check if host is PCI IDE device before allowing DMA */

	IDE_HFLAG_NO_AUTODMA		= (1 << 15),

	/* don't autotune PIO */

	IDE_HFLAG_NO_AUTOTUNE		= (1 << 16),

	/* host is CS5510/CS5520 */

	IDE_HFLAG_CS5520		= IDE_HFLAG_VDMA,

	/* no LBA48 */