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>

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 7bf922fc7a074219c4dafa17d73decd6d9bb4eeb..eaf839fa516566e3e049241d9f8c5c3d7ca6de65 100644 (file)
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -246,8 +246,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_aec62xx,
                .autodma        = AUTODMA,
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
-               .bootable       = OFF_BOARD,
-               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x07, /* udma0-2 */
        },{     /* 1 */
@@ -256,8 +255,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                .init_chipset   = init_chipset_aec62xx,
                .init_hwif      = init_hwif_aec62xx,
                .autodma        = NOAUTODMA,
-               .bootable       = OFF_BOARD,
-               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x1f, /* udma0-4 */
        },{     /* 2 */
@@ -267,7 +265,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_aec62xx,
                .autodma        = AUTODMA,
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
-               .bootable       = NEVER_BOARD,
                .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x1f, /* udma0-4 */
@@ -277,8 +274,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                .init_chipset   = init_chipset_aec62xx,
                .init_hwif      = init_hwif_aec62xx,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
-               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x3f, /* udma0-5 */
        },{     /* 4 */
@@ -288,8 +284,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_aec62xx,
                .autodma        = AUTODMA,
                .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
-               .bootable       = OFF_BOARD,
-               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x3f, /* udma0-5 */
        }

diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 6f8ebc959d853d43b76da92d35568faf0f291894..b6b44e9eb49263ac3df9983c812a67b83ffa5d8c 100644 (file)
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -777,7 +777,7 @@ static ide_pci_device_t ali15x3_chipset __devinitdata = {
        .init_hwif      = init_hwif_ali15x3,
        .init_dma       = init_dma_ali15x3,
        .autodma        = AUTODMA,
-       .bootable       = ON_BOARD,
+       .host_flags     = IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO5,
 };
 

diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 9e9e2b6ef6cbd3256943fe1b07138b09a34f0439..11d20bb7b85f3b5432e514aa7e755ab5d996b93b 100644 (file)
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -280,10 +280,10 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                .init_hwif      = init_hwif_amd74xx,                    \
                .autodma        = AUTODMA,                              \
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}}, \
-               .bootable       = ON_BOARD,                             \
-               .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST            \
-                               | IDE_HFLAG_PIO_NO_DOWNGRADE            \
-                               | IDE_HFLAG_POST_SET_MODE,              \
+               .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |          \
+                                 IDE_HFLAG_PIO_NO_DOWNGRADE |          \
+                                 IDE_HFLAG_POST_SET_MODE |             \
+                                 IDE_HFLAG_BOOTABLE,                   \
                .pio_mask       = ATA_PIO5,                             \
        }
 
@@ -294,10 +294,10 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                .init_hwif      = init_hwif_amd74xx,                    \
                .autodma        = AUTODMA,                              \
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}}, \
-               .bootable       = ON_BOARD,                             \
-               .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST            \
-                               | IDE_HFLAG_PIO_NO_DOWNGRADE            \
-                               | IDE_HFLAG_POST_SET_MODE,              \
+               .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |          \
+                                 IDE_HFLAG_PIO_NO_DOWNGRADE |          \
+                                 IDE_HFLAG_POST_SET_MODE |             \
+                                 IDE_HFLAG_BOOTABLE,                   \
                .pio_mask       = ATA_PIO5,                             \
        }
 

diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 9bb1b93325c6af829fa7b06a19ab9830f3cea9b6..f546a86f8b1947cd9de66a01b9b2afb85d691084 100644 (file)
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -204,15 +204,14 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
                .init_hwif      = init_hwif_atiixp,
                .autodma        = AUTODMA,
                .enablebits     = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
-               .bootable       = ON_BOARD,
+               .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}},
-               .bootable       = ON_BOARD,
-               .host_flags     = IDE_HFLAG_SINGLE,
+               .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO4,
        },
 };

diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index bd9adfbe982e8d7c8539cc244de1e16391f5a684..8e0ece5400b6013f08d53a2c45d001ba61288715 100644 (file)
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -585,8 +585,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_cmd64x,
                .autodma        = AUTODMA,
                .enablebits     = {{0x00,0x00,0x00}, {0x51,0x08,0x08}},
-               .bootable       = ON_BOARD,
-               .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
+               .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO5,
                .udma_mask      = 0x00, /* no udma */
        },{     /* 1 */
@@ -596,8 +595,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_cmd64x,
                .autodma        = AUTODMA,
                .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
-               .bootable       = ON_BOARD,
-               .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
+               .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO5,
                .udma_mask      = 0x07, /* udma0-2 */
        },{     /* 2 */
@@ -607,8 +605,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_cmd64x,
                .autodma        = AUTODMA,
                .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
-               .bootable       = ON_BOARD,
-               .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
+               .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO5,
                .udma_mask      = 0x1f, /* udma0-4 */
        },{     /* 3 */
@@ -618,8 +615,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_cmd64x,
                .autodma        = AUTODMA,
                .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
-               .bootable       = ON_BOARD,
-               .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
+               .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO5,
                .udma_mask      = 0x3f, /* udma0-5 */
        }

diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index b7906a9801206d9878256c069dc88f73d736510b..efd844a87aa60aba6b20d58312ce16f7fe7991c3 100644 (file)
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -153,10 +153,10 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
                .init_setup_dma = cs5520_init_setup_dma,        \
                .init_hwif      = init_hwif_cs5520,             \
                .autodma        = AUTODMA,                      \
-               .bootable       = ON_BOARD,                     \
                .host_flags     = IDE_HFLAG_ISA_PORTS |         \
                                  IDE_HFLAG_VDMA |              \
-                                 IDE_HFLAG_NO_ATAPI_DMA,       \
+                                 IDE_HFLAG_NO_ATAPI_DMA |      \
+                                 IDE_HFLAG_BOOTABLE,           \
                .pio_mask       = ATA_PIO4,                     \
        }
 

diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 2ca5bb280a8a4b6a5522b2adfa34ad93d43d3c00..da3f54f1d960eeebeaf8ad504895e1e175ec3033 100644 (file)
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -275,9 +275,8 @@ static ide_pci_device_t cs5530_chipset __devinitdata = {
        .init_chipset   = init_chipset_cs5530,
        .init_hwif      = init_hwif_cs5530,
        .autodma        = AUTODMA,
-       .bootable       = ON_BOARD,
+       .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO4,
-       .host_flags     = IDE_HFLAG_POST_SET_MODE,
 };
 
 static int __devinit cs5530_init_one(struct pci_dev *dev, const struct pci_device_id *id)

diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 45dc9a1b65a4d8abc854a7e22509a25e25c09c8b..a93ba9a5fad6352a80fcc053885efd35534446cc 100644 (file)
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -195,8 +195,8 @@ static ide_pci_device_t cs5535_chipset __devinitdata = {
        .name           = "CS5535",
        .init_hwif      = init_hwif_cs5535,
        .autodma        = AUTODMA,
-       .bootable       = ON_BOARD,
-       .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
+       .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE |
+                         IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO4,
 };
 

diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index c1e672f03244890d2a732d37538055f43eb886c0..8fec35e2f412a2bffb642559f4fb1a5ccc065777 100644 (file)
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -461,8 +461,8 @@ static ide_pci_device_t cy82c693_chipset __devinitdata = {
        .init_iops      = init_iops_cy82c693,
        .init_hwif      = init_hwif_cy82c693,
        .autodma        = AUTODMA,
-       .bootable       = ON_BOARD,
-       .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_TRUST_BIOS_FOR_DMA,
+       .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_TRUST_BIOS_FOR_DMA |
+                         IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO4,
 };
 

diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index dcee8278141e4f7a5ad8a19d72334d52f4d43c53..7389b6e2ed1d8debef16e7798b275d449fabc2f3 100644 (file)
--- 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,
        }
 };
 

diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 9709681dff6fe6ec64b7d65c867d7778fb0dddc4..1d6c6be257a73abb54838829805d3dddb8bcdfe2 100644 (file)
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -153,7 +153,6 @@ static ide_pci_device_t hpt34x_chipset __devinitdata = {
        .init_chipset   = init_chipset_hpt34x,
        .init_hwif      = init_hwif_hpt34x,
        .autodma        = NOAUTODMA,
-       .bootable       = NEVER_BOARD,
        .extra          = 16,
        .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
        .pio_mask       = ATA_PIO5,
@@ -168,7 +167,10 @@ static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_devic
        pci_read_config_word(dev, PCI_COMMAND, &pcicmd);
 
        d->name = chipset_names[(pcicmd & PCI_COMMAND_MEMORY) ? 1 : 0];
-       d->bootable = (pcicmd & PCI_COMMAND_MEMORY) ? OFF_BOARD : NEVER_BOARD;
+       if (pcicmd & PCI_COMMAND_MEMORY)
+               d->host_flags |= IDE_HFLAG_OFF_BOARD;
+       else
+               d->host_flags &= ~IDE_HFLAG_OFF_BOARD;
 
        return ide_setup_pci_device(dev, d);
 }

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 5d96a086bde4cb675d605aec874c41d3939dc4ba..eb2cfe54b1a928a2803427a25978118dc42c1c1a 100644 (file)
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1531,7 +1531,7 @@ static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d)
                pci_read_config_byte(dev,  PCI_INTERRUPT_PIN, &pin1);
                pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2);
                if (pin1 != pin2 && dev->irq == dev2->irq) {
-                       d->bootable = ON_BOARD;
+                       d->host_flags |= IDE_HFLAG_BOOTABLE;
                        printk("%s: onboard version of chipset, pin1=%d pin2=%d\n",
                               d->name, pin1, pin2);
                }
@@ -1553,9 +1553,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .init_dma       = init_dma_hpt366,
                .autodma        = AUTODMA,
                .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
-               .bootable       = OFF_BOARD,
                .extra          = 240,
-               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
        },{     /* 1 */
                .name           = "HPT372A",
@@ -1566,9 +1565,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-               .bootable       = OFF_BOARD,
                .extra          = 240,
-               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
        },{     /* 2 */
                .name           = "HPT302",
@@ -1579,9 +1577,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                .udma_mask      = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-               .bootable       = OFF_BOARD,
                .extra          = 240,
-               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
        },{     /* 3 */
                .name           = "HPT371",
@@ -1592,9 +1589,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                .udma_mask      = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-               .bootable       = OFF_BOARD,
                .extra          = 240,
-               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
        },{     /* 4 */
                .name           = "HPT374",
@@ -1605,9 +1601,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                .udma_mask      = ATA_UDMA5,
-               .bootable       = OFF_BOARD,
                .extra          = 240,
-               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
        },{     /* 5 */
                .name           = "HPT372N",
@@ -1618,9 +1613,8 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
                .autodma        = AUTODMA,
                .enablebits     = {{0x50,0x04,0x04}, {0x54,0x04,0x04}},
                .udma_mask      = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
-               .bootable       = OFF_BOARD,
                .extra          = 240,
-               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+               .host_flags     = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
        }
 };

diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index b52bca7b497a76ea3f4cc93dead30ac95e31a7f7..54fc0f4c95c475446807e0fb5487d3641c7aebf6 100644 (file)
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -193,8 +193,8 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
                .init_hwif      = init_hwif_it8213,     \
                .autodma        = AUTODMA,              \
                .enablebits     = {{0x41,0x80,0x80}}, \
-               .bootable       = ON_BOARD,             \
-               .host_flags     = IDE_HFLAG_SINGLE,     \
+               .host_flags     = IDE_HFLAG_SINGLE |    \
+                                 IDE_HFLAG_BOOTABLE,   \
                .pio_mask       = ATA_PIO4,             \
        }
 

diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 1b1286baa8e0df6073f8eef7ae089dc36bb87901..a41e8774ab0abee8c1ff3321e93c9a24db36742b 100644 (file)
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -637,8 +637,8 @@ static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const cha
                .init_chipset   = init_chipset_it821x,  \
                .init_hwif      = init_hwif_it821x,     \
                .autodma        = AUTODMA,              \
-               .bootable       = ON_BOARD,             \
                .fixup          = it821x_fixups,        \
+               .host_flags     = IDE_HFLAG_BOOTABLE,   \
                .pio_mask       = ATA_PIO4,             \
        }
 

diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index d151fbc26370788109ea5a44eb5b77782574093b..515683eb343def98b0a6962624e0836b507385f5 100644 (file)
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -128,7 +128,7 @@ static ide_pci_device_t jmicron_chipset __devinitdata = {
        .name           = "JMB",
        .init_hwif      = init_hwif_jmicron,
        .autodma        = AUTODMA,
-       .bootable       = ON_BOARD,
+       .host_flags     = IDE_HFLAG_BOOTABLE,
        .enablebits     = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
        .pio_mask       = ATA_PIO5,
 };

diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index 2d5dd983bfe3dc4408195775e91fe7ad8dce76ed..11d51e12c33d2c4c1fd87a37433df47177042b32 100644 (file)
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -267,9 +267,9 @@ static ide_pci_device_t ns87415_chipset __devinitdata = {
 #endif
        .init_hwif      = init_hwif_ns87415,
        .autodma        = AUTODMA,
-       .bootable       = ON_BOARD,
        .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
-                         IDE_HFLAG_NO_ATAPI_DMA,
+                         IDE_HFLAG_NO_ATAPI_DMA |
+                         IDE_HFLAG_BOOTABLE,
 };
 
 static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id)

diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 2437aed73f35be1fcd2ba9a354a80582a4e8090c..6d2dd0f332c93fd34185a3e2a0d57b87c719d2ed 100644 (file)
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -346,17 +346,17 @@ static ide_pci_device_t opti621_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_opti621,
                .autodma        = AUTODMA,
                .enablebits     = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
-               .bootable       = ON_BOARD,
+               .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
+                                 IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO3,
-               .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
        },{     /* 1 */
                .name           = "OPTI621X",
                .init_hwif      = init_hwif_opti621,
                .autodma        = AUTODMA,
                .enablebits     = {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
-               .bootable       = ON_BOARD,
+               .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
+                                 IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO3,
-               .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA,
        }
 };
 

diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 2238df9b8372629f7f22638436495d29f949f891..6bfc38f58cbf6ddabc6b169c44db34506b92c83c 100644 (file)
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -552,70 +552,63 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
                .init_chipset   = init_chipset_pdcnew,
                .init_hwif      = init_hwif_pdc202new,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
+               .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x3f, /* udma0-5 */
-               .host_flags     = IDE_HFLAG_POST_SET_MODE,
        },{     /* 1 */
                .name           = "PDC20269",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
                .init_hwif      = init_hwif_pdc202new,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
+               .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x7f, /* udma0-6*/
-               .host_flags     = IDE_HFLAG_POST_SET_MODE,
        },{     /* 2 */
                .name           = "PDC20270",
                .init_setup     = init_setup_pdc20270,
                .init_chipset   = init_chipset_pdcnew,
                .init_hwif      = init_hwif_pdc202new,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
+               .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x3f, /* udma0-5 */
-               .host_flags     = IDE_HFLAG_POST_SET_MODE,
        },{     /* 3 */
                .name           = "PDC20271",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
                .init_hwif      = init_hwif_pdc202new,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
+               .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x7f, /* udma0-6*/
-               .host_flags     = IDE_HFLAG_POST_SET_MODE,
        },{     /* 4 */
                .name           = "PDC20275",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
                .init_hwif      = init_hwif_pdc202new,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
+               .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x7f, /* udma0-6*/
-               .host_flags     = IDE_HFLAG_POST_SET_MODE,
        },{     /* 5 */
                .name           = "PDC20276",
                .init_setup     = init_setup_pdc20276,
                .init_chipset   = init_chipset_pdcnew,
                .init_hwif      = init_hwif_pdc202new,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
+               .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x7f, /* udma0-6*/
-               .host_flags     = IDE_HFLAG_POST_SET_MODE,
        },{     /* 6 */
                .name           = "PDC20277",
                .init_setup     = init_setup_pdcnew,
                .init_chipset   = init_chipset_pdcnew,
                .init_hwif      = init_hwif_pdc202new,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
+               .host_flags     = IDE_HFLAG_POST_SET_MODE | IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x7f, /* udma0-6*/
-               .host_flags     = IDE_HFLAG_POST_SET_MODE,
        }
 };
 

diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 903bf715fab30577f2ab2d44b18b63bab9edc2a9..217701f28511ce0696465285195ef268450a8844 100644 (file)
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -422,8 +422,8 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
                .extra          = 16,
+               .host_flags     = IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x07, /* udma0-2 */
        },{     /* 1 */
@@ -433,8 +433,8 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
                .extra          = 48,
+               .host_flags     = IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x1f, /* udma0-4 */
        },{     /* 2 */
@@ -444,8 +444,8 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
                .extra          = 48,
+               .host_flags     = IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x1f, /* udma0-4 */
        },{     /* 3 */
@@ -455,8 +455,8 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
                .extra          = 48,
+               .host_flags     = IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x3f, /* udma0-5 */
        },{     /* 4 */
@@ -466,8 +466,8 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_pdc202xx,
                .init_dma       = init_dma_pdc202xx,
                .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
                .extra          = 48,
+               .host_flags     = IDE_HFLAG_OFF_BOARD,
                .pio_mask       = ATA_PIO4,
                .udma_mask      = 0x3f, /* udma0-5 */
        }

diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index 3694db62f2576956096243a8bc9bda8b9bbb1278..287f4e38981e4c88a222dd76aee1c77b56d105c0 100644 (file)
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -417,7 +417,7 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
                .init_hwif      = init_hwif_piix,       \
                .autodma        = AUTODMA,              \
                .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \
-               .bootable       = ON_BOARD,             \
+               .host_flags     = IDE_HFLAG_BOOTABLE,   \
                .pio_mask       = ATA_PIO4,             \
                .udma_mask      = udma,                 \
        }
@@ -436,8 +436,7 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
                .init_hwif      = init_hwif_piix,
                .autodma        = NODMA,
                .enablebits     = {{0x6d,0xc0,0x80}, {0x6d,0xc0,0xc0}},
-               .bootable       = ON_BOARD,
-               .host_flags     = IDE_HFLAG_ISA_PORTS,
+               .host_flags     = IDE_HFLAG_ISA_PORTS | IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO4,
        },
 

diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index 3f506e8d44e3a89b59864198f97db21f7d015cdd..c4541e42e61294db26abe41f494ed07c1dd2c83a 100644 (file)
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -53,7 +53,7 @@ static ide_pci_device_t rz1000_chipset __devinitdata = {
        .name           = "RZ100x",
        .init_hwif      = init_hwif_rz1000,
        .autodma        = NODMA,
-       .bootable       = ON_BOARD,
+       .host_flags     = IDE_HFLAG_BOOTABLE,
 };
 
 static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id)

diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 0ba9d2408575caf8239c271eac2527d2fdcf63dc..c131923044fcad45bc2f1dafa69171d63d45bc10 100644 (file)
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -385,8 +385,8 @@ static ide_pci_device_t sc1200_chipset __devinitdata = {
        .name           = "SC1200",
        .init_hwif      = init_hwif_sc1200,
        .autodma        = AUTODMA,
-       .bootable       = ON_BOARD,
-       .host_flags     = IDE_HFLAG_ABUSE_DMA_MODES | IDE_HFLAG_POST_SET_MODE,
+       .host_flags     = IDE_HFLAG_ABUSE_DMA_MODES | IDE_HFLAG_POST_SET_MODE |
+                         IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO4,
 };
 

diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index ac519fa62153070e5a25f6661a51ad0bc9013795..1784ac2b38f0b286bb0339f7973746885c139717 100644 (file)
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -705,8 +705,8 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
       .init_iops       = init_iops_scc,                \
       .init_hwif       = init_hwif_scc,                \
       .autodma = AUTODMA,                              \
-      .bootable        = ON_BOARD,                             \
-      .host_flags      = IDE_HFLAG_SINGLE,             \
+      .host_flags      = IDE_HFLAG_SINGLE |            \
+                         IDE_HFLAG_BOOTABLE,           \
       .pio_mask                = ATA_PIO4,                     \
   }
 

diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index 40b89a29014ff14ccd3d64838ff0a5587c5b3fab..a8317c1d7b5a2f434aee67d6fcc10d79e66ed4c3 100644 (file)
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -392,9 +392,10 @@ static int __devinit init_setup_svwks (struct pci_dev *dev, ide_pci_device_t *d)
 static int __devinit init_setup_csb6 (struct pci_dev *dev, ide_pci_device_t *d)
 {
        if (!(PCI_FUNC(dev->devfn) & 1)) {
-               d->bootable = NEVER_BOARD;
                if (dev->resource[0].start == 0x01f1)
-                       d->bootable = ON_BOARD;
+                       d->host_flags |= IDE_HFLAG_BOOTABLE;
+               else
+                       d->host_flags &= ~IDE_HFLAG_BOOTABLE;
        }
 
        if ((dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE ||
@@ -414,7 +415,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                .init_chipset   = init_chipset_svwks,
                .init_hwif      = init_hwif_svwks,
                .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
+               .host_flags     = IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO4,
        },{     /* 1 */
                .name           = "SvrWks CSB5",
@@ -422,7 +423,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                .init_chipset   = init_chipset_svwks,
                .init_hwif      = init_hwif_svwks,
                .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
+               .host_flags     = IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO4,
        },{     /* 2 */
                .name           = "SvrWks CSB6",
@@ -430,7 +431,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                .init_chipset   = init_chipset_svwks,
                .init_hwif      = init_hwif_svwks,
                .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
+               .host_flags     = IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO4,
        },{     /* 3 */
                .name           = "SvrWks CSB6",
@@ -438,8 +439,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                .init_chipset   = init_chipset_svwks,
                .init_hwif      = init_hwif_svwks,
                .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-               .host_flags     = IDE_HFLAG_SINGLE,
+               .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO4,
        },{     /* 4 */
                .name           = "SvrWks HT1000",
@@ -447,8 +447,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
                .init_chipset   = init_chipset_svwks,
                .init_hwif      = init_hwif_svwks,
                .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-               .host_flags     = IDE_HFLAG_SINGLE,
+               .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO4,
        }
 };

diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 4c8108345d83d9b990c6094a9cba60d7fcc7102c..5ff796899daee28fb2924e7ce3638b071b243613 100644 (file)
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -920,7 +920,7 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
                .init_hwif      = init_hwif_siimage,    \
                .fixup          = siimage_fixup,        \
                .autodma        = AUTODMA,              \
-               .bootable       = ON_BOARD,             \
+               .host_flags     = IDE_HFLAG_BOOTABLE,   \
                .pio_mask       = ATA_PIO4,             \
        }
 

diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index f756c7f83b5da34e8a69c899f10587661af3afd5..5e682107690613235663360c20c4e5b61d37fc55 100644 (file)
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -592,7 +592,7 @@ static ide_pci_device_t sis5513_chipset __devinitdata = {
        .init_hwif      = init_hwif_sis5513,
        .autodma        = NOAUTODMA,
        .enablebits     = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
-       .bootable       = ON_BOARD,
+       .host_flags     = IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO4,
 };
 

diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index e78448148acafcc64392a44db4c4da3dd381a471..97c1331e5ec3ba46418b204bc2adaece8c5c2c1a 100644 (file)
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -406,7 +406,7 @@ static ide_pci_device_t sl82c105_chipset __devinitdata = {
        .init_hwif      = init_hwif_sl82c105,
        .autodma        = NOAUTODMA,
        .enablebits     = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
-       .bootable       = ON_BOARD,
+       .host_flags     = IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO5,
 };
 

diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index d0447219752d80831aaa18edcaa8563304f17c04..f2ab3a620647fc5a83e6cdf8720e11c6d577348a 100644 (file)
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -161,7 +161,7 @@ static ide_pci_device_t slc90e66_chipset __devinitdata = {
        .init_hwif      = init_hwif_slc90e66,
        .autodma        = AUTODMA,
        .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
-       .bootable       = ON_BOARD,
+       .host_flags     = IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO4,
 };
 

diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 0e3a8fe2037dc1d4fac4df8863ed7ee4678c6883..6f2d536910643bb96db6499377281acc58bd95f4 100644 (file)
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -228,8 +228,7 @@ static ide_pci_device_t tc86c001_chipset __devinitdata = {
        .init_chipset   = init_chipset_tc86c001,
        .init_hwif      = init_hwif_tc86c001,
        .autodma        = AUTODMA,
-       .bootable       = OFF_BOARD,
-       .host_flags     = IDE_HFLAG_SINGLE,
+       .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_OFF_BOARD,
        .pio_mask       = ATA_PIO4,
 };
 

diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 68e1e9adf84dbb9595cc5845a51daefbdc2a4873..8f89b6dd5e6cba99c321ce0e70b876ecf7c3859f 100644 (file)
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -113,7 +113,7 @@ static ide_pci_device_t triflex_device __devinitdata = {
        .init_hwif      = init_hwif_triflex,
        .autodma        = AUTODMA,
        .enablebits     = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
-       .bootable       = ON_BOARD,
+       .host_flags     = IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO4,
 };
 

diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 1307454f9c15492001d84aae1ada0b2162769b74..ad392025860ee7de5c7b80b1270308e0773c41c1 100644 (file)
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -325,12 +325,11 @@ static ide_pci_device_t trm290_chipset __devinitdata = {
        .name           = "TRM290",
        .init_hwif      = init_hwif_trm290,
        .autodma        = NOAUTODMA,
-       .bootable       = ON_BOARD,
+       .host_flags     = IDE_HFLAG_NO_ATAPI_DMA |
 #if 0 /* play it safe for now */
-       .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA | IDE_HFLAG_NO_ATAPI_DMA,
-#else
-       .host_flags     = IDE_HFLAG_NO_ATAPI_DMA,
+                         IDE_HFLAG_TRUST_BIOS_FOR_DMA |
 #endif
+                         IDE_HFLAG_BOOTABLE,
 };
 
 static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id)

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 648432f4c79e983e2a874288037311b4b5391fab..23f7eac96af39abbe56d8a7c93631799a761d5ac 100644 (file)
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -458,10 +458,10 @@ static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_via82cxxx,
                .autodma        = NOAUTODMA,
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
-               .bootable       = ON_BOARD,
-               .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST
-                               | IDE_HFLAG_PIO_NO_DOWNGRADE
-                               | IDE_HFLAG_POST_SET_MODE,
+               .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |
+                                 IDE_HFLAG_PIO_NO_DOWNGRADE |
+                                 IDE_HFLAG_POST_SET_MODE |
+                                 IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO5,
        },{     /* 1 */
                .name           = "VP_IDE",
@@ -469,10 +469,10 @@ static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
                .init_hwif      = init_hwif_via82cxxx,
                .autodma        = AUTODMA,
                .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-               .bootable       = ON_BOARD,
-               .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST
-                               | IDE_HFLAG_PIO_NO_DOWNGRADE
-                               | IDE_HFLAG_POST_SET_MODE,
+               .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |
+                                 IDE_HFLAG_PIO_NO_DOWNGRADE |
+                                 IDE_HFLAG_POST_SET_MODE |
+                                 IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO5,
        }
 };

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 3d101f73f9108399ba093e7a0ae4e3fdfdc6331b..d5901ec9e8cc4591a4e5abf42de3a8a01584a9e8 100644 (file)
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -360,6 +360,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d,
 {
        unsigned long ctl = 0, base = 0;
        ide_hwif_t *hwif;
+       u8 bootable = (d->host_flags & IDE_HFLAG_BOOTABLE) ? 1 : 0;
 
        if ((d->host_flags & IDE_HFLAG_ISA_PORTS) == 0) {
                /*  Possibly we should fail if these checks report true */
@@ -380,7 +381,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d,
                ctl = port ? 0x374 : 0x3f4;
                base = port ? 0x170 : 0x1f0;
        }
-       if ((hwif = ide_match_hwif(base, d->bootable, d->name)) == NULL)
+       if ((hwif = ide_match_hwif(base, bootable, d->name)) == NULL)
                return NULL;    /* no room in ide_hwifs[] */
        if (hwif->io_ports[IDE_DATA_OFFSET] != base ||
            hwif->io_ports[IDE_CONTROL_OFFSET] != (ctl | 2)) {

diff --git a/include/linux/ide.h b/include/linux/ide.h
index e44ecc942ff867eb80a5bd844d6573fe282ac5e7..575bf81dc84acbca0c063ac02de65694c441b945 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1210,15 +1210,6 @@ extern void default_hwif_iops(ide_hwif_t *);
 extern void default_hwif_mmiops(ide_hwif_t *);
 extern void default_hwif_transport(ide_hwif_t *);
 
-#define ON_BOARD               1
-#define NEVER_BOARD            0
-
-#ifdef CONFIG_BLK_DEV_OFFBOARD
-#  define OFF_BOARD            ON_BOARD
-#else /* CONFIG_BLK_DEV_OFFBOARD */
-#  define OFF_BOARD            NEVER_BOARD
-#endif /* CONFIG_BLK_DEV_OFFBOARD */
-
 #define NODMA 0
 #define NOAUTODMA 1
 #define AUTODMA 2
@@ -1259,8 +1250,16 @@ enum {
        IDE_HFLAG_VDMA                  = (1 << 11),
        /* ATAPI DMA is unsupported */
        IDE_HFLAG_NO_ATAPI_DMA          = (1 << 12),
+       /* set if host is a "bootable" controller */
+       IDE_HFLAG_BOOTABLE              = (1 << 13),
 };
 
+#ifdef CONFIG_BLK_DEV_OFFBOARD
+# define IDE_HFLAG_OFF_BOARD   IDE_HFLAG_BOOTABLE
+#else
+# define IDE_HFLAG_OFF_BOARD   0
+#endif
+
 typedef struct ide_pci_device_s {
        char                    *name;
        int                     (*init_setup)(struct pci_dev *, struct ide_pci_device_s *);
@@ -1272,7 +1271,6 @@ typedef struct ide_pci_device_s {
        void                    (*fixup)(ide_hwif_t *);
        u8                      autodma;
        ide_pci_enablebit_t     enablebits[2];
-       u8                      bootable;
        unsigned int            extra;
        struct ide_pci_device_s *next;
        u16                     host_flags;