13 files changed, 26 insertions, 21 deletions

diff --git a/drivers/ide/buddha.c b/drivers/ide/buddha.c
index 606c3320fa58..d028f8864bc1 100644
--- a/drivers/ide/buddha.c
+++ b/drivers/ide/buddha.c
@@ -145,6 +145,7 @@ static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base,
 
 static const struct ide_port_info buddha_port_info = {
         .host_flags             = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,
+        .irq_flags              = IRQF_SHARED,
 };
 
     /*
diff --git a/drivers/ide/delkin_cb.c b/drivers/ide/delkin_cb.c
index bacb1194c9c9..f153b95619bb 100644
--- a/drivers/ide/delkin_cb.c
+++ b/drivers/ide/delkin_cb.c
@@ -66,6 +66,7 @@ static const struct ide_port_info delkin_cb_port_info = {
         .port_ops               = &delkin_cb_port_ops,
         .host_flags             = IDE_HFLAG_IO_32BIT | IDE_HFLAG_UNMASK_IRQS |
                                   IDE_HFLAG_NO_DMA,
+        .irq_flags              = IRQF_SHARED,
         .init_chipset           = delkin_cb_init_chipset,
 };
 
diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c
index bb0c86e976e4..6085feb1fae8 100644
--- a/drivers/ide/falconide.c
+++ b/drivers/ide/falconide.c
@@ -105,6 +105,7 @@ static const struct ide_port_info falconide_port_info = {
         .tp_ops                 = &falconide_tp_ops,
         .host_flags             = IDE_HFLAG_MMIO | IDE_HFLAG_SERIALIZE |
                                   IDE_HFLAG_NO_DMA,
+        .irq_flags              = IRQF_SHARED,
 };
 
 static void __init falconide_setup_ports(hw_regs_t *hw)
diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c
index dce01765adbc..dc778251cb05 100644
--- a/drivers/ide/gayle.c
+++ b/drivers/ide/gayle.c
@@ -120,6 +120,7 @@ static void __init gayle_setup_ports(hw_regs_t *hw, unsigned long base,
 static const struct ide_port_info gayle_port_info = {
         .host_flags             = IDE_HFLAG_MMIO | IDE_HFLAG_SERIALIZE |
                                   IDE_HFLAG_NO_DMA,
+        .irq_flags              = IRQF_SHARED,
 };
 
     /*
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index f50210fe558f..9e47f3529d55 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -154,6 +154,7 @@ static const struct ide_port_ops idecs_port_ops = {
 static const struct ide_port_info idecs_port_info = {
         .port_ops               = &idecs_port_ops,
         .host_flags             = IDE_HFLAG_NO_DMA,
+        .irq_flags              = IRQF_SHARED,
 };
 
 static struct ide_host *idecs_register(unsigned long io, unsigned long ctl,
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 030b0ea1a1e1..7007c48e27ae 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -841,6 +841,7 @@ static void unexpected_intr(int irq, ide_hwif_t *hwif)
 irqreturn_t ide_intr (int irq, void *dev_id)
 {
         ide_hwif_t *hwif = (ide_hwif_t *)dev_id;
+        struct ide_host *host = hwif->host;
         ide_drive_t *uninitialized_var(drive);
         ide_handler_t *handler;
         unsigned long flags;
@@ -848,8 +849,8 @@ irqreturn_t ide_intr (int irq, void *dev_id)
         irqreturn_t irq_ret = IRQ_NONE;
         int plug_device = 0;
 
-        if (hwif->host->host_flags & IDE_HFLAG_SERIALIZE) {
-                if (hwif != hwif->host->cur_port)
+        if (host->host_flags & IDE_HFLAG_SERIALIZE) {
+                if (hwif != host->cur_port)
                         goto out_early;
         }
 
@@ -872,27 +873,19 @@ irqreturn_t ide_intr (int irq, void *dev_id)
                  *
                  * For PCI, we cannot tell the difference,
                  * so in that case we just ignore it and hope it goes away.
-                 *
-                 * FIXME: unexpected_intr should be hwif-> then we can
-                 * remove all the ifdef PCI crap
                  */
-#ifdef CONFIG_BLK_DEV_IDEPCI
-                if (hwif->chipset != ide_pci)
-#endif  /* CONFIG_BLK_DEV_IDEPCI */
-                {
+                if ((host->irq_flags & IRQF_SHARED) == 0) {
                         /*
                          * Probably not a shared PCI interrupt,
                          * so we can safely try to do something about it:
                          */
                         unexpected_intr(irq, hwif);
-#ifdef CONFIG_BLK_DEV_IDEPCI
                 } else {
                         /*
                          * Whack the status register, just in case
                          * we have a leftover pending IRQ.
                          */
                         (void)hwif->tp_ops->read_status(hwif);
-#endif /* CONFIG_BLK_DEV_IDEPCI */
                 }
                 goto out;
         }
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4b00945cf7d1..f3a56595eb75 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -837,20 +837,13 @@ static int ide_port_setup_devices(ide_hwif_t *hwif)
 static int init_irq (ide_hwif_t *hwif)
 {
         struct ide_io_ports *io_ports = &hwif->io_ports;
-        irq_handler_t irq_handler;
-        int sa = 0;
+        struct ide_host *host = hwif->host;
+        irq_handler_t irq_handler = host->irq_handler;
+        int sa = host->irq_flags;
 
-        irq_handler = hwif->host->irq_handler;
         if (irq_handler == NULL)
                 irq_handler = ide_intr;
 
-#if defined(__mc68000__)
-        sa = IRQF_SHARED;
-#endif /* __mc68000__ */
-
-        if (hwif->chipset == ide_pci)
-                sa = IRQF_SHARED;
-
         if (io_ports->ctl_addr)
                 hwif->tp_ops->set_irq(hwif, 1);
 
diff --git a/drivers/ide/macide.c b/drivers/ide/macide.c
index 56112ee9f5a8..4b1718e83283 100644
--- a/drivers/ide/macide.c
+++ b/drivers/ide/macide.c
@@ -82,6 +82,7 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base,
 
 static const struct ide_port_info macide_port_info = {
         .host_flags             = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,
+        .irq_flags              = IRQF_SHARED,
 };
 
 static const char *mac_ide_name[] =
diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c
index ebd576df2d84..32f669d656a6 100644
--- a/drivers/ide/q40ide.c
+++ b/drivers/ide/q40ide.c
@@ -112,6 +112,7 @@ static const struct ide_tp_ops q40ide_tp_ops = {
 static const struct ide_port_info q40ide_port_info = {
         .tp_ops                 = &q40ide_tp_ops,
         .host_flags             = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,
+        .irq_flags              = IRQF_SHARED,
 };
 
 /* 
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 540bc842f3ad..ae965da5dde0 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -891,6 +891,7 @@ static const struct ide_port_info scc_chipset __devinitdata = {
         .port_ops       = &scc_port_ops,
         .dma_ops        = &scc_dma_ops,
         .host_flags     = IDE_HFLAG_SINGLE,
+        .irq_flags      = IRQF_SHARED,
         .pio_mask       = ATA_PIO4,
 };
 
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 24bc884826fc..a19dbccd7617 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -558,6 +558,8 @@ int ide_pci_init_one(struct pci_dev *dev, const struct ide_port_info *d,
 
         host->host_priv = priv;
 
+        host->irq_flags = IRQF_SHARED;
+
         pci_set_drvdata(dev, host);
 
         ret = do_ide_setup_pci_device(dev, d, 1);
@@ -606,6 +608,8 @@ int ide_pci_init_two(struct pci_dev *dev1, struct pci_dev *dev2,
 
         host->host_priv = priv;
 
+        host->irq_flags = IRQF_SHARED;
+
         pci_set_drvdata(pdev[0], host);
         pci_set_drvdata(pdev[1], host);
 
diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c
index fdb9d7037694..1cffe70f385d 100644
--- a/drivers/ide/sgiioc4.c
+++ b/drivers/ide/sgiioc4.c
@@ -557,6 +557,7 @@ static const struct ide_port_info sgiioc4_port_info __devinitconst = {
         .port_ops               = &sgiioc4_port_ops,
         .dma_ops                = &sgiioc4_dma_ops,
         .host_flags             = IDE_HFLAG_MMIO,
+        .irq_flags              = IRQF_SHARED,
         .mwdma_mask             = ATA_MWDMA2_ONLY,
 };
 
diff --git a/include/linux/ide.h b/include/linux/ide.h
index ab8ee4f32f52..901d323c7bbe 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -839,6 +839,9 @@ struct ide_host {
         irq_handler_t   irq_handler;
 
         unsigned long   host_flags;
+
+        int             irq_flags;
+
         void            *host_priv;
         ide_hwif_t      *cur_port;      /* for hosts requiring serialization */
 
@@ -1371,6 +1374,9 @@ struct ide_port_info {
         u16                     max_sectors;    /* if < than the default one */
 
         u32                     host_flags;
+
+        int                     irq_flags;
+
         u8                      pio_mask;
         u8                      swdma_mask;
         u8                      mwdma_mask;