diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-18 18:30:06 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-18 18:30:06 -0400 |
commit | 7cab14a79973893392111b8f887856a54621f759 (patch) | |
tree | 925ad89a10daa3584e05806eadffb628ef97313b /drivers/ide/pci/hpt34x.c | |
parent | 33c1002ed912ac9dacedd5d5b166da3b72d18460 (diff) |
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>
Diffstat (limited to 'drivers/ide/pci/hpt34x.c')
-rw-r--r-- | drivers/ide/pci/hpt34x.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index 9709681dff6f..1d6c6be257a7 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
@@ -153,7 +153,6 @@ static ide_pci_device_t hpt34x_chipset __devinitdata = { | |||
153 | .init_chipset = init_chipset_hpt34x, | 153 | .init_chipset = init_chipset_hpt34x, |
154 | .init_hwif = init_hwif_hpt34x, | 154 | .init_hwif = init_hwif_hpt34x, |
155 | .autodma = NOAUTODMA, | 155 | .autodma = NOAUTODMA, |
156 | .bootable = NEVER_BOARD, | ||
157 | .extra = 16, | 156 | .extra = 16, |
158 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA, | 157 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA, |
159 | .pio_mask = ATA_PIO5, | 158 | .pio_mask = ATA_PIO5, |
@@ -168,7 +167,10 @@ static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_devic | |||
168 | pci_read_config_word(dev, PCI_COMMAND, &pcicmd); | 167 | pci_read_config_word(dev, PCI_COMMAND, &pcicmd); |
169 | 168 | ||
170 | d->name = chipset_names[(pcicmd & PCI_COMMAND_MEMORY) ? 1 : 0]; | 169 | d->name = chipset_names[(pcicmd & PCI_COMMAND_MEMORY) ? 1 : 0]; |
171 | d->bootable = (pcicmd & PCI_COMMAND_MEMORY) ? OFF_BOARD : NEVER_BOARD; | 170 | if (pcicmd & PCI_COMMAND_MEMORY) |
171 | d->host_flags |= IDE_HFLAG_OFF_BOARD; | ||
172 | else | ||
173 | d->host_flags &= ~IDE_HFLAG_OFF_BOARD; | ||
172 | 174 | ||
173 | return ide_setup_pci_device(dev, d); | 175 | return ide_setup_pci_device(dev, d); |
174 | } | 176 | } |