ide: allow host drivers to specify IRQ flags

* Add ->irq_flags field to struct ide_port_info and struct ide_host.

* Update host drivers and IDE PCI code to use ->irq_flags field.

* Convert init_irq() and ide_intr() to use host->irq_flags.

This fixes handling of shared IRQs for non-PCI hosts
and removes ugly ifdeffery from core IDE code.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 3 insertions, 10 deletions

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);