[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>

11 files changed, 18 insertions, 18 deletions

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index 5256342e8532..40569f40e90e 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -267,7 +267,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
 
         /* must be a GPIO; ergo must trigger on both edges */
         status = request_irq(board->det_pin, at91_cf_irq,
-                        SA_SAMPLE_RANDOM, driver_name, cf);
+                        IRQF_SAMPLE_RANDOM, driver_name, cf);
         if (status < 0)
                 goto fail0;
         device_init_wakeup(&pdev->dev, 1);
@@ -280,7 +280,7 @@ static int __init at91_cf_probe(struct platform_device *pdev)
          */
         if (board->irq_pin) {
                 status = request_irq(board->irq_pin, at91_cf_irq,
-                                SA_SHIRQ, driver_name, cf);
+                                IRQF_SHARED, driver_name, cf);
                 if (status < 0)
                         goto fail0a;
                 cf->socket.pci_irq = board->irq_pin;
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c
index c662e4f89d46..ad02629c8be2 100644
--- a/drivers/pcmcia/hd64465_ss.c
+++ b/drivers/pcmcia/hd64465_ss.c
@@ -761,7 +761,7 @@ static int hs_init_socket(hs_socket_t *sp, int irq, unsigned long mem_base,
         
         hd64465_register_irq_demux(sp->irq, hs_irq_demux, sp);
         
-        if ((err = request_irq(sp->irq, hs_interrupt, SA_INTERRUPT, MODNAME, sp)) < 0)
+        if ((err = request_irq(sp->irq, hs_interrupt, IRQF_DISABLED, MODNAME, sp)) < 0)
             return err;
         if (request_mem_region(sp->mem_base, sp->mem_length, MODNAME) == 0) {
             sp->mem_base = 0;
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c
index d5f03a338c6c..2163aa75a257 100644
--- a/drivers/pcmcia/i82092.c
+++ b/drivers/pcmcia/i82092.c
@@ -149,7 +149,7 @@ static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_de
 
         /* Register the interrupt handler */
         dprintk(KERN_DEBUG "Requesting interrupt %i \n",dev->irq);
-        if ((ret = request_irq(dev->irq, i82092aa_interrupt, SA_SHIRQ, "i82092aa", i82092aa_interrupt))) {
+        if ((ret = request_irq(dev->irq, i82092aa_interrupt, IRQF_SHARED, "i82092aa", i82092aa_interrupt))) {
                 printk(KERN_ERR "i82092aa: Failed to register IRQ %d, aborting\n", dev->irq);
                 goto err_out_free_res;
         }
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c
index ff51a65d9433..1cc2682394b1 100644
--- a/drivers/pcmcia/i82365.c
+++ b/drivers/pcmcia/i82365.c
@@ -509,7 +509,7 @@ static irqreturn_t i365_count_irq(int irq, void *dev, struct pt_regs *regs)
 static u_int __init test_irq(u_short sock, int irq)
 {
     debug(2, "  testing ISA irq %d\n", irq);
-    if (request_irq(irq, i365_count_irq, SA_PROBEIRQ, "scan",
+    if (request_irq(irq, i365_count_irq, IRQF_PROBE_SHARED, "scan",
                         i365_count_irq) != 0)
         return 1;
     irq_hits = 0; irq_sock = sock;
@@ -562,7 +562,7 @@ static u_int __init isa_scan(u_short sock, u_int mask0)
     } else {
         /* Fallback: just find interrupts that aren't in use */
         for (i = 0; i < 16; i++)
-            if ((mask0 & (1 << i)) && (_check_irq(i, SA_PROBEIRQ) == 0))
+            if ((mask0 & (1 << i)) && (_check_irq(i, IRQF_PROBE_SHARED) == 0))
                 mask1 |= (1 << i);
         printk("default");
         /* If scan failed, default to polled status */
@@ -726,7 +726,7 @@ static void __init add_pcic(int ns, int type)
         u_int cs_mask = mask & ((cs_irq) ? (1<<cs_irq) : ~(1<<12));
         for (cs_irq = 15; cs_irq > 0; cs_irq--)
             if ((cs_mask & (1 << cs_irq)) &&
-                (_check_irq(cs_irq, SA_PROBEIRQ) == 0))
+                (_check_irq(cs_irq, IRQF_PROBE_SHARED) == 0))
                 break;
         if (cs_irq) {
             grab_irq = 1;
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c
index 2c23d7584399..420e10aec0ae 100644
--- a/drivers/pcmcia/omap_cf.c
+++ b/drivers/pcmcia/omap_cf.c
@@ -232,7 +232,7 @@ static int __init omap_cf_probe(struct device *dev)
         dev_set_drvdata(dev, cf);
 
         /* this primarily just shuts up irq handling noise */
-        status = request_irq(irq, omap_cf_irq, SA_SHIRQ,
+        status = request_irq(irq, omap_cf_irq, IRQF_SHARED,
                         driver_name, cf);
         if (status < 0)
                 goto fail0;
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 3281e519e714..7bf25b88ea31 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -801,9 +801,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
         /* Decide what type of interrupt we are registering */
         type = 0;
         if (s->functions > 1)           /* All of this ought to be handled higher up */
-                type = SA_SHIRQ;
+                type = IRQF_SHARED;
         if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
-                type = SA_SHIRQ;
+                type = IRQF_SHARED;
 
 #ifdef CONFIG_PCMCIA_PROBE
         if (s->irq.AssignedIRQ != 0) {
@@ -845,7 +845,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
         if (ret && !s->irq.AssignedIRQ) {
                 if (!s->pci_irq)
                         return ret;
-                type = SA_SHIRQ;
+                type = IRQF_SHARED;
                 irq = s->pci_irq;
         }
 
@@ -855,7 +855,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
         }
 
         /* Make sure the fact the request type was overridden is passed back */
-        if (type == SA_SHIRQ && !(req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)) {
+        if (type == IRQF_SHARED && !(req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)) {
                 req->Attributes |= IRQ_TYPE_DYNAMIC_SHARING;
                 printk(KERN_WARNING "pcmcia: request for exclusive IRQ could not be fulfilled.\n");
                 printk(KERN_WARNING "pcmcia: the driver needs updating to supported shared IRQ lines.\n");
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index 9ee26c1b8635..22c5e7427ddd 100644
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -689,7 +689,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev,
         pci_set_drvdata(dev, socket);
         if (irq_mode == 1) {
                 /* Register the interrupt handler */
-                if ((ret = request_irq(dev->irq, pd6729_interrupt, SA_SHIRQ,
+                if ((ret = request_irq(dev->irq, pd6729_interrupt, IRQF_SHARED,
                                                         "pd6729", socket))) {
                         printk(KERN_ERR "pd6729: Failed to register irq %d, "
                                                         "aborting\n", dev->irq);
diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index ecf65d4c4e95..888358fac598 100644
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -523,7 +523,7 @@ int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt,
                 if (irqs[i].sock != skt->nr)
                         continue;
                 res = request_irq(irqs[i].irq, soc_common_pcmcia_interrupt,
-                                  SA_INTERRUPT, irqs[i].str, skt);
+                                  IRQF_DISABLED, irqs[i].str, skt);
                 if (res)
                         break;
                 set_irq_type(irqs[i].irq, IRQT_NOEDGE);
diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c
index 459e6e1946fd..e076a13db555 100644
--- a/drivers/pcmcia/vrc4171_card.c
+++ b/drivers/pcmcia/vrc4171_card.c
@@ -730,7 +730,7 @@ static int __devinit vrc4171_card_init(void)
 
         retval = vrc4171_add_sockets();
         if (retval == 0)
-                retval = request_irq(vrc4171_irq, pccard_interrupt, SA_SHIRQ,
+                retval = request_irq(vrc4171_irq, pccard_interrupt, IRQF_SHARED,
                                      vrc4171_card_name, vrc4171_sockets);
 
         if (retval < 0) {
diff --git a/drivers/pcmcia/vrc4173_cardu.c b/drivers/pcmcia/vrc4173_cardu.c
index 6004196f7cc1..d19a9138135f 100644
--- a/drivers/pcmcia/vrc4173_cardu.c
+++ b/drivers/pcmcia/vrc4173_cardu.c
@@ -500,7 +500,7 @@ static int __devinit vrc4173_cardu_probe(struct pci_dev *dev,
                 return -ENOMEM;
         }
 
-        if (request_irq(dev->irq, cardu_interrupt, SA_SHIRQ, socket->name, socket) < 0) {
+        if (request_irq(dev->irq, cardu_interrupt, IRQF_SHARED, socket->name, socket) < 0) {
                 pcmcia_unregister_socket(socket->pcmcia_socket);
                 socket->pcmcia_socket = NULL;
                 iounmap(socket->base);
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 47e57602d5ea..1344746381e8 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -923,7 +923,7 @@ static int yenta_probe_cb_irq(struct yenta_socket *socket)
 
         socket->probe_status = 0;
 
-        if (request_irq(socket->cb_irq, yenta_probe_handler, SA_SHIRQ, "yenta", socket)) {
+        if (request_irq(socket->cb_irq, yenta_probe_handler, IRQF_SHARED, "yenta", socket)) {
                 printk(KERN_WARNING "Yenta: request_irq() in yenta_probe_cb_irq() failed!\n");
                 return -1;
         }
@@ -1172,7 +1172,7 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i
 
         /* We must finish initialization here */
 
-        if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, SA_SHIRQ, "yenta", socket)) {
+        if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) {
                 /* No IRQ or request_irq failed. Poll */
                 socket->cb_irq = 0; /* But zero is a valid IRQ number. */
                 init_timer(&socket->poll_timer);