ide: remove CONFIG_IDEPCI_SHARE_IRQ config option

We can safely remove CONFIG_IDEPCI_SHARE_IRQ and always support
PCI IRQ sharing.

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

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index fb06555708a8d431734a99e0a1a85cf3f7178139..ee01e273a53711ddf23244296425342c98a955b0 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -374,17 +374,6 @@ comment "PCI IDE chipsets support"
 config BLK_DEV_IDEPCI
        bool
 
-config IDEPCI_SHARE_IRQ
-       bool "Sharing PCI IDE interrupts support"
-       depends on BLK_DEV_IDEPCI
-       help
-         Some ATA/IDE chipsets have hardware support which allows for
-         sharing a single IRQ with other cards. To enable support for
-         this in the ATA/IDE driver, say Y here.
-
-         It is safe to say Y to this question, in most cases.
-         If unsure, say N.
-
 config IDEPCI_PCIBUS_ORDER
        def_bool BLK_DEV_IDE=y && BLK_DEV_IDEPCI
 
@@ -707,7 +696,6 @@ config BLK_DEV_SVWKS
 config BLK_DEV_SGIIOC4
        tristate "Silicon Graphics IOC4 chipset ATA/ATAPI support"
        depends on (IA64_SGI_SN2 || IA64_GENERIC) && SGI_IOC4
-       select IDEPCI_SHARE_IRQ
        select BLK_DEV_IDEDMA_PCI
        help
          This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 4aac1cc7101d3d18c96364a1d97fd1cd91c79b15..6a6d1c188030a97a857dc79e4f3993851439d1e9 100644 (file)
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -449,7 +449,6 @@ int drive_is_ready (ide_drive_t *drive)
        udelay(1);
 #endif
 
-#ifdef CONFIG_IDEPCI_SHARE_IRQ
        /*
         * We do a passive status test under shared PCI interrupts on
         * cards that truly share the ATA side interrupt, but may also share
@@ -459,7 +458,6 @@ int drive_is_ready (ide_drive_t *drive)
        if (IDE_CONTROL_REG)
                stat = hwif->INB(IDE_ALTSTATUS_REG);
        else
-#endif /* CONFIG_IDEPCI_SHARE_IRQ */
                /* Note: this may clear a pending IRQ!! */
                stat = hwif->INB(IDE_STATUS_REG);