[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

6 files changed, 7 insertions, 7 deletions

diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c
index 075a2a07924e..6b7638b84290 100644
--- a/drivers/mmc/at91_mci.c
+++ b/drivers/mmc/at91_mci.c
@@ -850,7 +850,7 @@ static int at91_mci_probe(struct platform_device *pdev)
         /*
          * Allocate the MCI interrupt
          */
-        ret = request_irq(AT91_ID_MCI, at91_mci_irq, SA_SHIRQ, DRIVER_NAME, host);
+        ret = request_irq(AT91_ID_MCI, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host);
         if (ret) {
                 printk(KERN_ERR "Failed to request MCI interrupt\n");
                 clk_disable(mci_clk);
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c
index 41069908f4a7..fb606165af3b 100644
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/au1xmmc.c
@@ -886,7 +886,7 @@ static int __devinit au1xmmc_probe(struct platform_device *pdev)
         int i, ret = 0;
 
         /* THe interrupt is shared among all controllers */
-        ret = request_irq(AU1100_SD_IRQ, au1xmmc_irq, SA_INTERRUPT, "MMC", 0);
+        ret = request_irq(AU1100_SD_IRQ, au1xmmc_irq, IRQF_DISABLED, "MMC", 0);
 
         if (ret) {
                 printk(DRIVER_NAME "ERROR: Couldn't get int %d: %d\n",
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 9dfb34a857e3..1886562abdd4 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/mmci.c
@@ -531,11 +531,11 @@ static int mmci_probe(struct amba_device *dev, void *id)
         writel(0, host->base + MMCIMASK1);
         writel(0xfff, host->base + MMCICLEAR);
 
-        ret = request_irq(dev->irq[0], mmci_irq, SA_SHIRQ, DRIVER_NAME " (cmd)", host);
+        ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host);
         if (ret)
                 goto unmap;
 
-        ret = request_irq(dev->irq[1], mmci_pio_irq, SA_SHIRQ, DRIVER_NAME " (pio)", host);
+        ret = request_irq(dev->irq[1], mmci_pio_irq, IRQF_SHARED, DRIVER_NAME " (pio)", host);
         if (ret)
                 goto irq0_free;
 
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index 7a4840ec53b7..e0e14b3423c6 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -1085,7 +1085,7 @@ static int __init mmc_omap_probe(struct platform_device *pdev)
 
                 omap_set_gpio_direction(host->switch_pin, 1);
                 ret = request_irq(OMAP_GPIO_IRQ(host->switch_pin),
-                                  mmc_omap_switch_irq, SA_TRIGGER_RISING, DRIVER_NAME, host);
+                                  mmc_omap_switch_irq, IRQF_TRIGGER_RISING, DRIVER_NAME, host);
                 if (ret) {
                         dev_warn(mmc_dev(host->mmc), "Unable to get IRQ for MMC cover switch\n");
                         omap_free_gpio(host->switch_pin);
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 8e9100bd57ef..a871c09a6e11 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -1075,7 +1075,7 @@ static int __devinit sdhci_probe_slot(struct pci_dev *pdev, int slot)
 
         setup_timer(&host->timer, sdhci_timeout_timer, (long)host);
 
-        ret = request_irq(host->irq, sdhci_irq, SA_SHIRQ,
+        ret = request_irq(host->irq, sdhci_irq, IRQF_SHARED,
                 host->slot_descr, host);
         if (ret)
                 goto unmap;
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index 3fcd86c08ebd..8a30ef3ae419 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -1553,7 +1553,7 @@ static int __devinit wbsd_request_irq(struct wbsd_host *host, int irq)
          * Allocate interrupt.
          */
 
-        ret = request_irq(irq, wbsd_irq, SA_SHIRQ, DRIVER_NAME, host);
+        ret = request_irq(irq, wbsd_irq, IRQF_SHARED, DRIVER_NAME, host);
         if (ret)
                 return ret;