diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-19 19:11:55 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-19 19:11:55 -0400 |
commit | a5d8c5c834d3cabf4b7b477c3f6ee923c25026fc (patch) | |
tree | 19fc04470569a3c2f227d5aac3078a15ac65bb32 /drivers/ide/pci/aec62xx.c | |
parent | 2229833c1365346b64357a9263fa724f74f5e376 (diff) |
ide: add ide_pci_device_t.host_flags (take 2)
* Rename ide_pci_device_t.flags to ide_pci_device_t.host_flags
and IDEPCI_FLAG_ISA_PORTS flag to IDE_HFLAG_ISA_PORTS.
* Add IDE_HFLAG_SINGLE flag for single channel devices.
* Convert core code and all IDE PCI drivers to use IDE_HFLAG_SINGLE
and remove no longer needed ide_pci_device_t.channels field.
v2:
* Fix issues noticed by Sergei:
- correct code alignment in scc_pata.c
- s/IDE_HFLAG_SINGLE/~IDE_HFLAG_SINGLE/ in serverworks.c
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/aec62xx.c')
-rw-r--r-- | drivers/ide/pci/aec62xx.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index 6d18fef558bd..f8ac91c22e64 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c | |||
@@ -265,7 +265,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { | |||
265 | .init_setup = init_setup_aec62xx, | 265 | .init_setup = init_setup_aec62xx, |
266 | .init_chipset = init_chipset_aec62xx, | 266 | .init_chipset = init_chipset_aec62xx, |
267 | .init_hwif = init_hwif_aec62xx, | 267 | .init_hwif = init_hwif_aec62xx, |
268 | .channels = 2, | ||
269 | .autodma = AUTODMA, | 268 | .autodma = AUTODMA, |
270 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, | 269 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, |
271 | .bootable = OFF_BOARD, | 270 | .bootable = OFF_BOARD, |
@@ -275,7 +274,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { | |||
275 | .init_setup = init_setup_aec62xx, | 274 | .init_setup = init_setup_aec62xx, |
276 | .init_chipset = init_chipset_aec62xx, | 275 | .init_chipset = init_chipset_aec62xx, |
277 | .init_hwif = init_hwif_aec62xx, | 276 | .init_hwif = init_hwif_aec62xx, |
278 | .channels = 2, | ||
279 | .autodma = NOAUTODMA, | 277 | .autodma = NOAUTODMA, |
280 | .bootable = OFF_BOARD, | 278 | .bootable = OFF_BOARD, |
281 | .udma_mask = 0x1f, /* udma0-4 */ | 279 | .udma_mask = 0x1f, /* udma0-4 */ |
@@ -284,7 +282,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { | |||
284 | .init_setup = init_setup_aec62xx, | 282 | .init_setup = init_setup_aec62xx, |
285 | .init_chipset = init_chipset_aec62xx, | 283 | .init_chipset = init_chipset_aec62xx, |
286 | .init_hwif = init_hwif_aec62xx, | 284 | .init_hwif = init_hwif_aec62xx, |
287 | .channels = 2, | ||
288 | .autodma = AUTODMA, | 285 | .autodma = AUTODMA, |
289 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, | 286 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, |
290 | .bootable = NEVER_BOARD, | 287 | .bootable = NEVER_BOARD, |
@@ -294,7 +291,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { | |||
294 | .init_setup = init_setup_aec6x80, | 291 | .init_setup = init_setup_aec6x80, |
295 | .init_chipset = init_chipset_aec62xx, | 292 | .init_chipset = init_chipset_aec62xx, |
296 | .init_hwif = init_hwif_aec62xx, | 293 | .init_hwif = init_hwif_aec62xx, |
297 | .channels = 2, | ||
298 | .autodma = AUTODMA, | 294 | .autodma = AUTODMA, |
299 | .bootable = OFF_BOARD, | 295 | .bootable = OFF_BOARD, |
300 | .udma_mask = 0x3f, /* udma0-5 */ | 296 | .udma_mask = 0x3f, /* udma0-5 */ |
@@ -303,7 +299,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { | |||
303 | .init_setup = init_setup_aec6x80, | 299 | .init_setup = init_setup_aec6x80, |
304 | .init_chipset = init_chipset_aec62xx, | 300 | .init_chipset = init_chipset_aec62xx, |
305 | .init_hwif = init_hwif_aec62xx, | 301 | .init_hwif = init_hwif_aec62xx, |
306 | .channels = 2, | ||
307 | .autodma = AUTODMA, | 302 | .autodma = AUTODMA, |
308 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, | 303 | .enablebits = {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}}, |
309 | .bootable = OFF_BOARD, | 304 | .bootable = OFF_BOARD, |