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

Commit 47b68788 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add IDE_HFLAG_NO_{DMA,AUTODMA} host flags 



Add IDE_HFLAG_NO_{DMA,AUTODMA} host flags.  Convert all host drivers using
ide_pci_device_t to use these flags instead of d->autodma and then remove no
longer needed d->autodma.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 7cab14a7

drivers/ide/pci/aec62xx.c

+2 −6
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_aec62xx,

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.autodma	= AUTODMA,

		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,
@@ -254,8 +253,8 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_aec62xx,

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.autodma	= NOAUTODMA,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_NO_AUTODMA |

				  IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= 0x1f, /* udma0-4 */

	},{	/* 2 */
@@ -263,7 +262,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_aec62xx,

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.autodma	= AUTODMA,

		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA,

		.pio_mask	= ATA_PIO4,
@@ -273,7 +271,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_aec6x80,

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.autodma	= AUTODMA,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= 0x3f, /* udma0-5 */
@@ -282,7 +279,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_aec6x80,

		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.autodma	= AUTODMA,

		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

drivers/ide/pci/alim15x3.c

+0 −1
Original line number Diff line number Diff line
@@ -776,7 +776,6 @@ static ide_pci_device_t ali15x3_chipset __devinitdata = { 
	.init_chipset	= init_chipset_ali15x3,

	.init_hwif	= init_hwif_ali15x3,

	.init_dma	= init_dma_ali15x3,

	.autodma	= AUTODMA,

	.host_flags	= IDE_HFLAG_BOOTABLE,

	.pio_mask	= ATA_PIO5,

};

drivers/ide/pci/amd74xx.c

+0 −2
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) 
		.name		= name_str,				\

		.init_chipset	= init_chipset_amd74xx,			\

		.init_hwif	= init_hwif_amd74xx,			\

		.autodma	= AUTODMA,				\

		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},	\

		.host_flags	= IDE_HFLAG_PIO_NO_BLACKLIST |		\

				  IDE_HFLAG_PIO_NO_DOWNGRADE |		\
@@ -292,7 +291,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) 
		.name		= name_str,				\

		.init_chipset	= init_chipset_amd74xx,			\

		.init_hwif	= init_hwif_amd74xx,			\

		.autodma	= AUTODMA,				\

		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x01,0x01}},	\

		.host_flags	= IDE_HFLAG_PIO_NO_BLACKLIST |		\

				  IDE_HFLAG_PIO_NO_DOWNGRADE |		\

drivers/ide/pci/atiixp.c

+0 −2
Original line number Diff line number Diff line
@@ -202,14 +202,12 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = { 
	{	/* 0 */

		.name		= "ATIIXP",

		.init_hwif	= init_hwif_atiixp,

		.autodma	= AUTODMA,

		.enablebits	= {{0x48,0x01,0x00}, {0x48,0x08,0x00}},

		.host_flags	= IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

	},{	/* 1 */

		.name		= "SB600_PATA",

		.init_hwif	= init_hwif_atiixp,

		.autodma	= AUTODMA,

		.enablebits	= {{0x48,0x01,0x00}, {0x00,0x00,0x00}},

 		.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

drivers/ide/pci/cmd64x.c

+0 −4
Original line number Diff line number Diff line
@@ -583,7 +583,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_cmd64x,

		.init_chipset	= init_chipset_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

		.autodma	= AUTODMA,

		.enablebits	= {{0x00,0x00,0x00}, {0x51,0x08,0x08}},

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,
@@ -593,7 +592,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_cmd646,

		.init_chipset	= init_chipset_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

		.autodma	= AUTODMA,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,
@@ -603,7 +601,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_cmd64x,

		.init_chipset	= init_chipset_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

		.autodma	= AUTODMA,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,
@@ -613,7 +610,6 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_setup	= init_setup_cmd64x,

		.init_chipset	= init_chipset_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

		.autodma	= AUTODMA,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,