Commit 2467922a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS 



There should be no functional changes caused by this patch.

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

drivers/ide/atiixp.c

+1 −2
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ static const struct ide_port_info atiixp_pci_info[] __devinitdata = { 
		.name		= DRV_NAME,

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

		.port_ops	= &atiixp_port_ops,

		.host_flags	= IDE_HFLAG_LEGACY_IRQS,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,
@@ -151,7 +150,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitdata = { 
		.name		= DRV_NAME,

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

		.port_ops	= &atiixp_port_ops,

		.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_LEGACY_IRQS,

		.host_flags	= IDE_HFLAG_SINGLE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,

drivers/ide/ide-pci-generic.c

+1 −3
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ static int ide_generic_all; /* Set to claim all devices */ 
module_param_named(all_generic_ide, ide_generic_all, bool, 0444);

MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");



#define IDE_HFLAGS_UMC (IDE_HFLAG_NO_DMA | IDE_HFLAG_FORCE_LEGACY_IRQS)



#define DECLARE_GENERIC_PCI_DEV(extra_flags) \

	{ \

		.name		= DRV_NAME, \
@@ -61,7 +59,7 @@ static const struct ide_port_info generic_chipsets[] __devinitdata = { 
	/*  2: SAMURAI / HT6565 / HINT_IDE */

	DECLARE_GENERIC_PCI_DEV(0),

	/*  3: UM8673F / UM8886A / UM8886BF */

	DECLARE_GENERIC_PCI_DEV(IDE_HFLAGS_UMC),

	DECLARE_GENERIC_PCI_DEV(IDE_HFLAG_NO_DMA),

	/*  4: VIA_IDE / OPTI621V / Piccolo010{2,3,5} */

	DECLARE_GENERIC_PCI_DEV(IDE_HFLAG_NO_AUTODMA),

drivers/ide/piix.c

+1 −10
Original line number Diff line number Diff line
@@ -318,19 +318,12 @@ static const struct ide_port_ops ich_port_ops = { 
	.cable_detect		= piix_cable_detect,

};



#ifndef CONFIG_IA64

 #define IDE_HFLAGS_PIIX IDE_HFLAG_LEGACY_IRQS

#else

 #define IDE_HFLAGS_PIIX 0

#endif



#define DECLARE_PIIX_DEV(udma) \

	{						\

		.name		= DRV_NAME,		\

		.init_hwif	= init_hwif_piix,	\

		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \

		.port_ops	= &piix_port_ops,	\

		.host_flags	= IDE_HFLAGS_PIIX,	\

		.pio_mask	= ATA_PIO4,		\

		.swdma_mask	= ATA_SWDMA2_ONLY,	\

		.mwdma_mask	= ATA_MWDMA12_ONLY,	\
@@ -344,7 +337,6 @@ static const struct ide_port_ops ich_port_ops = { 
		.init_hwif	= init_hwif_piix, \

		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \

		.port_ops	= &ich_port_ops, \

		.host_flags	= IDE_HFLAGS_PIIX, \

		.pio_mask	= ATA_PIO4, \

		.swdma_mask	= ATA_SWDMA2_ONLY, \

		.mwdma_mask	= ATA_MWDMA12_ONLY, \
@@ -360,8 +352,7 @@ static const struct ide_port_info piix_pci_info[] __devinitdata = { 
		 */

		.name		= DRV_NAME,

		.enablebits	= {{0x6d,0xc0,0x80}, {0x6d,0xc0,0xc0}},

		.host_flags	= IDE_HFLAG_ISA_PORTS | IDE_HFLAG_NO_DMA |

				  IDE_HFLAGS_PIIX,

		.host_flags	= IDE_HFLAG_ISA_PORTS | IDE_HFLAG_NO_DMA,

		.pio_mask	= ATA_PIO4,

		/* This is a painful system best to let it self tune for now */

	},

drivers/ide/serverworks.c

+2 −7
Original line number Diff line number Diff line
@@ -353,14 +353,11 @@ static const struct ide_port_ops svwks_port_ops = { 
	.cable_detect		= svwks_cable_detect,

};



#define IDE_HFLAGS_SVWKS IDE_HFLAG_LEGACY_IRQS



static const struct ide_port_info serverworks_chipsets[] __devinitdata = {

	{	/* 0: OSB4 */

		.name		= DRV_NAME,

		.init_chipset	= init_chipset_svwks,

		.port_ops	= &osb4_port_ops,

		.host_flags	= IDE_HFLAGS_SVWKS,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= 0x00, /* UDMA is problematic on OSB4 */
@@ -369,7 +366,6 @@ static const struct ide_port_info serverworks_chipsets[] __devinitdata = { 
		.name		= DRV_NAME,

		.init_chipset	= init_chipset_svwks,

		.port_ops	= &svwks_port_ops,

		.host_flags	= IDE_HFLAGS_SVWKS,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,
@@ -378,7 +374,6 @@ static const struct ide_port_info serverworks_chipsets[] __devinitdata = { 
		.name		= DRV_NAME,

		.init_chipset	= init_chipset_svwks,

		.port_ops	= &svwks_port_ops,

		.host_flags	= IDE_HFLAGS_SVWKS,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,
@@ -387,7 +382,7 @@ static const struct ide_port_info serverworks_chipsets[] __devinitdata = { 
		.name		= DRV_NAME,

		.init_chipset	= init_chipset_svwks,

		.port_ops	= &svwks_port_ops,

		.host_flags	= IDE_HFLAGS_SVWKS | IDE_HFLAG_SINGLE,

		.host_flags	= IDE_HFLAG_SINGLE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,
@@ -396,7 +391,7 @@ static const struct ide_port_info serverworks_chipsets[] __devinitdata = { 
		.name		= DRV_NAME,

		.init_chipset	= init_chipset_svwks,

		.port_ops	= &svwks_port_ops,

		.host_flags	= IDE_HFLAGS_SVWKS | IDE_HFLAG_SINGLE,

		.host_flags	= IDE_HFLAG_SINGLE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,

drivers/ide/sis5513.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static const struct ide_port_info sis5513_chipset __devinitdata = { 
	.name		= DRV_NAME,

	.init_chipset	= init_chipset_sis5513,

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

	.host_flags	= IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_NO_AUTODMA,

	.host_flags	= IDE_HFLAG_NO_AUTODMA,

	.pio_mask	= ATA_PIO4,

	.mwdma_mask	= ATA_MWDMA2,

};