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, 0 insertions, 15 deletions

diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 0d51a11e81da..48caa468b762 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -95,92 +95,77 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
         {       /* 0 */
                 .name           = "Unknown",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 1 */
                 .name           = "NS87410",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
                 .bootable       = ON_BOARD,
         },{     /* 2 */
                 .name           = "SAMURAI",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 3 */
                 .name           = "HT6565",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 4 */
                 .name           = "UM8673F",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NODMA,
                 .bootable       = ON_BOARD,
         },{     /* 5 */
                 .name           = "UM8886A",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NODMA,
                 .bootable       = ON_BOARD,
         },{     /* 6 */
                 .name           = "UM8886BF",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NODMA,
                 .bootable       = ON_BOARD,
         },{     /* 7 */
                 .name           = "HINT_IDE",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 8 */
                 .name           = "VIA_IDE",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 9 */
                 .name           = "OPTI621V",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 10 */
                 .name           = "VIA8237SATA",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
         },{     /* 11 */
                 .name           = "Piccolo0102",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 12 */
                 .name           = "Piccolo0103",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 13 */
                 .name           = "Piccolo0105",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = NOAUTODMA,
                 .bootable       = ON_BOARD,
         },{     /* 14 */
                 .name           = "Revolution",
                 .init_hwif      = init_hwif_generic,
-                .channels       = 2,
                 .autodma        = AUTODMA,
                 .bootable       = OFF_BOARD,
         }