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

Commit 5e71d9c5 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: IDE_HFLAG_BOOTABLE -> IDE_HFLAG_NON_BOOTABLE 



"bootable" should be the default behavior so replace
IDE_HFLAG_BOOTABLE host flag with IDE_HFLAG_NON_BOOTABLE.

There should be no functional changes caused by this patch.

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

drivers/ide/pci/aec62xx.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -220,7 +220,8 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

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

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

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA |

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA |

				  IDE_HFLAG_ABUSE_SET_DMA_MODE,

				  IDE_HFLAG_ABUSE_SET_DMA_MODE |

				  IDE_HFLAG_NON_BOOTABLE,

		.pio_mask	= ATA_PIO4,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA4,

		.udma_mask	= ATA_UDMA4,

drivers/ide/pci/alim15x3.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -750,7 +750,6 @@ static const struct ide_port_info ali15x3_chipset __devinitdata = { 
	.init_chipset	= init_chipset_ali15x3,

	.init_chipset	= init_chipset_ali15x3,

	.init_hwif	= init_hwif_ali15x3,

	.init_hwif	= init_hwif_ali15x3,

	.init_dma	= init_dma_ali15x3,

	.init_dma	= init_dma_ali15x3,

	.host_flags	= IDE_HFLAG_BOOTABLE,

	.pio_mask	= ATA_PIO5,

	.pio_mask	= ATA_PIO5,

	.swdma_mask	= ATA_SWDMA2,

	.swdma_mask	= ATA_SWDMA2,

	.mwdma_mask	= ATA_MWDMA2,

	.mwdma_mask	= ATA_MWDMA2,

drivers/ide/pci/amd74xx.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -223,8 +223,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) 
	 IDE_HFLAG_ABUSE_SET_DMA_MODE | \

	 IDE_HFLAG_ABUSE_SET_DMA_MODE | \

	 IDE_HFLAG_POST_SET_MODE | \

	 IDE_HFLAG_POST_SET_MODE | \

	 IDE_HFLAG_IO_32BIT | \

	 IDE_HFLAG_IO_32BIT | \

	 IDE_HFLAG_UNMASK_IRQS | \

	 IDE_HFLAG_UNMASK_IRQS)

	 IDE_HFLAG_BOOTABLE)





#define DECLARE_AMD_DEV(name_str, swdma, udma)				\

#define DECLARE_AMD_DEV(name_str, swdma, udma)				\

	{								\

	{								\

drivers/ide/pci/atiixp.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -151,7 +151,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitdata = { 
		.name		= "ATIIXP",

		.name		= "ATIIXP",

		.init_hwif	= init_hwif_atiixp,

		.init_hwif	= init_hwif_atiixp,

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

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

		.host_flags	= IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,

		.host_flags	= IDE_HFLAG_LEGACY_IRQS,

		.pio_mask	= ATA_PIO4,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,

		.udma_mask	= ATA_UDMA5,
@@ -159,8 +159,7 @@ static const struct ide_port_info atiixp_pci_info[] __devinitdata = { 
		.name		= "SB600_PATA",

		.name		= "SB600_PATA",

		.init_hwif	= init_hwif_atiixp,

		.init_hwif	= init_hwif_atiixp,

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

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

 		.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_LEGACY_IRQS |

		.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_LEGACY_IRQS,

				  IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,

		.udma_mask	= ATA_UDMA5,

drivers/ide/pci/cmd64x.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -440,8 +440,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

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

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

		.host_flags	= IDE_HFLAG_CLEAR_SIMPLEX |

		.host_flags	= IDE_HFLAG_CLEAR_SIMPLEX |

				  IDE_HFLAG_ABUSE_PREFETCH |

				  IDE_HFLAG_ABUSE_PREFETCH,

				  IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,

		.pio_mask	= ATA_PIO5,

		.mwdma_mask	= ATA_MWDMA2,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= 0x00, /* no udma */

		.udma_mask	= 0x00, /* no udma */
@@ -451,7 +450,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

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

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

		.chipset	= ide_cmd646,

		.chipset	= ide_cmd646,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH,

		.pio_mask	= ATA_PIO5,

		.pio_mask	= ATA_PIO5,

		.mwdma_mask	= ATA_MWDMA2,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA2,

		.udma_mask	= ATA_UDMA2,
@@ -460,7 +459,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { 
		.init_chipset	= init_chipset_cmd64x,

		.init_chipset	= init_chipset_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

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

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

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH,

		.pio_mask	= ATA_PIO5,

		.pio_mask	= ATA_PIO5,

		.mwdma_mask	= ATA_MWDMA2,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA4,

		.udma_mask	= ATA_UDMA4,
@@ -469,7 +468,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { 
		.init_chipset	= init_chipset_cmd64x,

		.init_chipset	= init_chipset_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

		.init_hwif	= init_hwif_cmd64x,

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

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

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH,

		.pio_mask	= ATA_PIO5,

		.pio_mask	= ATA_PIO5,

		.mwdma_mask	= ATA_MWDMA2,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,

		.udma_mask	= ATA_UDMA5,