[PATCH] Scheduled removal of SA_xxx interrupt flags fixups

The obsolete SA_xxx interrupt flags have been used despite the scheduled
removal.  Fixup the remaining users.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Greg KH <greg@kroah.com>
Cc: Dave Airlie <airlied@linux.ie>
Cc: James Simmons <jsimmons@infradead.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 9de2d38a5321..38b2fa424b2d 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -882,7 +882,7 @@ static int ehea_reg_interrupts(struct net_device *dev)
                          , "%s-recv%d", dev->name, i);
                 ret = ibmebus_request_irq(NULL, pr->recv_eq->attr.ist1,
                                           ehea_recv_irq_handler,
-                                          SA_INTERRUPT, pr->int_recv_name, pr);
+                                          IRQF_DISABLED, pr->int_recv_name, pr);
                 if (ret) {
                         ehea_error("failed registering irq for ehea_recv_int:"
                                    "port_res_nr:%d, ist=%X", i,
@@ -899,7 +899,7 @@ static int ehea_reg_interrupts(struct net_device *dev)
 
         ret = ibmebus_request_irq(NULL, port->qp_eq->attr.ist1,
                                   ehea_qp_aff_irq_handler,
-                                  SA_INTERRUPT, port->int_aff_name, port);
+                                  IRQF_DISABLED, port->int_aff_name, port);
         if (ret) {
                 ehea_error("failed registering irq for qp_aff_irq_handler:"
                            "ist=%X", port->qp_eq->attr.ist1);
@@ -916,7 +916,7 @@ static int ehea_reg_interrupts(struct net_device *dev)
                          "%s-send%d", dev->name, i);
                 ret = ibmebus_request_irq(NULL, pr->send_eq->attr.ist1,
                                           ehea_send_irq_handler,
-                                          SA_INTERRUPT, pr->int_send_name,
+                                          IRQF_DISABLED, pr->int_send_name,
                                           pr);
                 if (ret) {
                         ehea_error("failed registering irq for ehea_send "
@@ -2539,7 +2539,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
                      (unsigned long)adapter);
 
         ret = ibmebus_request_irq(NULL, adapter->neq->attr.ist1,
-                                  ehea_interrupt_neq, SA_INTERRUPT,
+                                  ehea_interrupt_neq, IRQF_DISABLED,
                                   "ehea_neq", adapter);
         if (ret) {
                 dev_err(&dev->ofdev.dev, "requesting NEQ IRQ failed");