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>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index 3b88a3a56116..5539a25eae99 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -194,10 +194,9 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
                 .name           = name_str,                     \
                 .init_setup_dma = cs5520_init_setup_dma,        \
                 .init_hwif      = init_hwif_cs5520,             \
-                .channels       = 2,                            \
                 .autodma        = AUTODMA,                      \
                 .bootable       = ON_BOARD,                     \
-                .flags          = IDEPCI_FLAG_ISA_PORTS,        \
+                .host_flags     = IDE_HFLAG_ISA_PORTS,          \
         }
 
 static ide_pci_device_t cyrix_chipsets[] __devinitdata = {