cmd64x: set IDE_HFLAG_SERIALIZE explictly for CMD646

* Set IDE_HFLAG_SERIALIZE explictly for CMD646.

* Remove no longer needed ide_cmd646 chipset type (which has
  a nice side-effect of fixing handling of unexpected IRQs).

Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
index 935385c77e062d12e6ad6061942dfcdd5cbbdd8d..3623bf013bcfde7a2249d743091317da7bd87bad 100644 (file)
--- a/drivers/ide/cmd64x.c
+++ b/drivers/ide/cmd64x.c
@@ -424,10 +424,10 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
                .name           = DRV_NAME,
                .init_chipset   = init_chipset_cmd64x,
                .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
-               .chipset        = ide_cmd646,
                .port_ops       = &cmd64x_port_ops,
                .dma_ops        = &cmd648_dma_ops,
-               .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
+               .host_flags     = IDE_HFLAG_SERIALIZE |
+                                 IDE_HFLAG_ABUSE_PREFETCH,
                .pio_mask       = ATA_PIO5,
                .mwdma_mask     = ATA_MWDMA2,
                .udma_mask      = ATA_UDMA2,

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index b0f9ededfad72613ff6d801f3e1a0bc0feb02f68..a0eb72e2a026486a9017a4081877d46c8e10fdeb 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1125,7 +1125,7 @@ static int init_irq (ide_hwif_t *hwif)
                sa = IRQF_SHARED;
 #endif /* __mc68000__ */
 
-               if (hwif->chipset == ide_pci || hwif->chipset == ide_cmd646)
+               if (hwif->chipset == ide_pci)
                        sa = IRQF_SHARED;
 
                if (io_ports->ctl_addr)

diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index dd899e1f38412f4e43b2e68d4c6594c021179867..e41669eec2c2e65585123b92aa040ec72798d758 100644 (file)
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -48,7 +48,6 @@ static int proc_ide_read_imodel
        case ide_ht6560b:       name = "ht6560b";       break;
        case ide_rz1000:        name = "rz1000";        break;
        case ide_trm290:        name = "trm290";        break;
-       case ide_cmd646:        name = "cmd646";        break;
        case ide_cy82c693:      name = "cy82c693";      break;
        case ide_4drives:       name = "4drives";       break;
        case ide_pmac:          name = "mac-io";        break;

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 0b8af0535d85a3f862d441ed8d15d3502bd19126..150e42311ee0c08b7abb1ef2cf0c3f201b39f5e7 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -171,7 +171,7 @@ enum {              ide_unknown,    ide_generic,    ide_pci,
                ide_cmd640,     ide_dtc2278,    ide_ali14xx,
                ide_qd65xx,     ide_umc8672,    ide_ht6560b,
                ide_rz1000,     ide_trm290,
-               ide_cmd646,     ide_cy82c693,   ide_4drives,
+               ide_cy82c693,   ide_4drives,
                ide_pmac,       ide_acorn,
                ide_au1xxx,     ide_palm3710
 };