ide: add IDE_HFLAG_BOOTABLE host flag

Add IDE_HFLAG_BOOTABLE host flag and IDE_HFLAG_OFF_BOARD define.  Convert
all host drivers using ide_pci_device_t to use IDE_HFLAG_{BOOTABLE,OFF_BOARD}
instead of d->bootable and then remove no longer needed d->bootable.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index dcee8278141e..7389b6e2ed1d 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -79,8 +79,8 @@ static void __devinit init_hwif_generic (ide_hwif_t *hwif)
                 .name           = name_str, \
                 .init_hwif      = init_hwif_generic, \
                 .autodma        = dma_setting, \
-                .bootable       = ON_BOARD, \
-                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA, \
+                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA | \
+                                  IDE_HFLAG_BOOTABLE, \
         }
 
 static ide_pci_device_t generic_chipsets[] __devinitdata = {
@@ -91,8 +91,8 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                 .init_hwif      = init_hwif_generic,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
-                .bootable       = ON_BOARD,
-                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
+                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
+                                  IDE_HFLAG_BOOTABLE,
         },
 
         /*  2 */ DECLARE_GENERIC_PCI_DEV("SAMURAI",             AUTODMA),
@@ -108,8 +108,8 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                 .name           = "VIA8237SATA",
                 .init_hwif      = init_hwif_generic,
                 .autodma        = AUTODMA,
-                .bootable       = OFF_BOARD,
-                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
+                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
+                                  IDE_HFLAG_OFF_BOARD,
         },
 
         /* 11 */ DECLARE_GENERIC_PCI_DEV("Piccolo0102",         NOAUTODMA),
@@ -120,8 +120,8 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
                 .name           = "Revolution",
                 .init_hwif      = init_hwif_generic,
                 .autodma        = AUTODMA,
-                .bootable       = OFF_BOARD,
-                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
+                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
+                                  IDE_HFLAG_OFF_BOARD,
         }
 };