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/aec62xx.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/aec62xx.c')
| -rw-r--r-- | drivers/ide/pci/aec62xx.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index 7bf922fc7a07..eaf839fa5165 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c | |||
| @@ -246,8 +246,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { | |||
| 246 | .init_hwif = init_hwif_aec62xx, | 246 | .init_hwif = init_hwif_aec62xx, |
| 247 | .autodma = AUTODMA, | 247 | .autodma = AUTODMA, |
| 248 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, | 248 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, |
| 249 | .bootable = OFF_BOARD, | 249 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD, |
| 250 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA, | ||
| 251 | .pio_mask = ATA_PIO4, | 250 | .pio_mask = ATA_PIO4, |
| 252 | .udma_mask = 0x07, /* udma0-2 */ | 251 | .udma_mask = 0x07, /* udma0-2 */ |
| 253 | },{ /* 1 */ | 252 | },{ /* 1 */ |
| @@ -256,8 +255,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { | |||
| 256 | .init_chipset = init_chipset_aec62xx, | 255 | .init_chipset = init_chipset_aec62xx, |
| 257 | .init_hwif = init_hwif_aec62xx, | 256 | .init_hwif = init_hwif_aec62xx, |
| 258 | .autodma = NOAUTODMA, | 257 | .autodma = NOAUTODMA, |
| 259 | .bootable = OFF_BOARD, | 258 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD, |
| 260 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA, | ||
| 261 | .pio_mask = ATA_PIO4, | 259 | .pio_mask = ATA_PIO4, |
| 262 | .udma_mask = 0x1f, /* udma0-4 */ | 260 | .udma_mask = 0x1f, /* udma0-4 */ |
| 263 | },{ /* 2 */ | 261 | },{ /* 2 */ |
| @@ -267,7 +265,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { | |||
| 267 | .init_hwif = init_hwif_aec62xx, | 265 | .init_hwif = init_hwif_aec62xx, |
| 268 | .autodma = AUTODMA, | 266 | .autodma = AUTODMA, |
| 269 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, | 267 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, |
| 270 | .bootable = NEVER_BOARD, | ||
| 271 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA, | 268 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA, |
| 272 | .pio_mask = ATA_PIO4, | 269 | .pio_mask = ATA_PIO4, |
| 273 | .udma_mask = 0x1f, /* udma0-4 */ | 270 | .udma_mask = 0x1f, /* udma0-4 */ |
| @@ -277,8 +274,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { | |||
| 277 | .init_chipset = init_chipset_aec62xx, | 274 | .init_chipset = init_chipset_aec62xx, |
| 278 | .init_hwif = init_hwif_aec62xx, | 275 | .init_hwif = init_hwif_aec62xx, |
| 279 | .autodma = AUTODMA, | 276 | .autodma = AUTODMA, |
| 280 | .bootable = OFF_BOARD, | 277 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD, |
| 281 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA, | ||
| 282 | .pio_mask = ATA_PIO4, | 278 | .pio_mask = ATA_PIO4, |
| 283 | .udma_mask = 0x3f, /* udma0-5 */ | 279 | .udma_mask = 0x3f, /* udma0-5 */ |
| 284 | },{ /* 4 */ | 280 | },{ /* 4 */ |
| @@ -288,8 +284,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { | |||
| 288 | .init_hwif = init_hwif_aec62xx, | 284 | .init_hwif = init_hwif_aec62xx, |
| 289 | .autodma = AUTODMA, | 285 | .autodma = AUTODMA, |
| 290 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, | 286 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, |
| 291 | .bootable = OFF_BOARD, | 287 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD, |
| 292 | .host_flags = IDE_HFLAG_NO_ATAPI_DMA, | ||
| 293 | .pio_mask = ATA_PIO4, | 288 | .pio_mask = ATA_PIO4, |
| 294 | .udma_mask = 0x3f, /* udma0-5 */ | 289 | .udma_mask = 0x3f, /* udma0-5 */ |
| 295 | } | 290 | } |