Staging: meilhaus: Remove long-deprecated SA_* interrupt macros.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/meilhaus/me0600_ext_irq.c b/drivers/staging/meilhaus/me0600_ext_irq.c
index 2f6fedc..2b97392 100644 (file)
--- a/drivers/staging/meilhaus/me0600_ext_irq.c
+++ b/drivers/staging/meilhaus/me0600_ext_irq.c
@@ -434,11 +434,7 @@ me0600_ext_irq_subdevice_t *me0600_ext_irq_constructor(uint32_t plx_reg_base,
        subdevice->irq = irq;
 
        err = request_irq(subdevice->irq, me0600_isr,
-#ifdef IRQF_DISABLED
                          IRQF_DISABLED | IRQF_SHARED,
-#else
-                         SA_INTERRUPT | SA_SHIRQ,
-#endif
                          ME0600_NAME, (void *)subdevice);
 
        if (err) {

diff --git a/drivers/staging/meilhaus/me1400_ext_irq.c b/drivers/staging/meilhaus/me1400_ext_irq.c
index 0dc6b45..cc4d71b 100644 (file)
--- a/drivers/staging/meilhaus/me1400_ext_irq.c
+++ b/drivers/staging/meilhaus/me1400_ext_irq.c
@@ -458,11 +458,7 @@ me1400_ext_irq_subdevice_t *me1400_ext_irq_constructor(uint32_t device_id,
        subdevice->irq = irq;
 
        err = request_irq(irq, me1400_ext_irq_isr,
-#ifdef IRQF_DISABLED
                          IRQF_DISABLED | IRQF_SHARED,
-#else
-                         SA_INTERRUPT | SA_SHIRQ,
-#endif
                          ME1400_NAME, (void *)subdevice);
 
        if (err) {

diff --git a/drivers/staging/meilhaus/me4600_ai.c b/drivers/staging/meilhaus/me4600_ai.c
index a3cfef0..e496d0c 100644 (file)
--- a/drivers/staging/meilhaus/me4600_ai.c
+++ b/drivers/staging/meilhaus/me4600_ai.c
@@ -299,11 +299,7 @@ me4600_ai_subdevice_t *me4600_ai_constructor(uint32_t reg_base,
        // Register interrupt service routine.
        subdevice->irq = irq;
        if (request_irq(subdevice->irq, me4600_ai_isr,
-#ifdef IRQF_DISABLED
                        IRQF_DISABLED | IRQF_SHARED,
-#else
-                       SA_INTERRUPT | SA_SHIRQ,
-#endif
                        ME4600_NAME, subdevice)) {
                PERROR("Cannot register interrupt service routine.\n");
                me_subdevice_deinit((me_subdevice_t *) subdevice);

diff --git a/drivers/staging/meilhaus/me4600_ao.c b/drivers/staging/meilhaus/me4600_ao.c
index eb47269..4000dac 100644 (file)
--- a/drivers/staging/meilhaus/me4600_ao.c
+++ b/drivers/staging/meilhaus/me4600_ao.c
@@ -2567,11 +2567,7 @@ me4600_ao_subdevice_t *me4600_ao_constructor(uint32_t reg_base,
        if (subdevice->fifo) {
                subdevice->irq = irq;
                if (request_irq(subdevice->irq, me4600_ao_isr,
-#ifdef IRQF_DISABLED
                                IRQF_DISABLED | IRQF_SHARED,
-#else
-                               SA_INTERRUPT | SA_SHIRQ,
-#endif
                                ME4600_NAME, subdevice)) {
                        PERROR("Cannot get interrupt line.\n");
                        PDEBUG("free circ_buf = %p size=%d",
@@ -5737,7 +5733,7 @@ me4600_ao_subdevice_t *me4600_ao_constructor(uint32_t reg_base,
        subdevice->irq = irq;
 
        if (request_irq
-           (subdevice->irq, me4600_ao_isr, SA_INTERRUPT | SA_SHIRQ,
+           (subdevice->irq, me4600_ao_isr, IRQF_DISABLED | IRQF_SHARED,
             ME4600_NAME, subdevice)) {
                PERROR("Cannot get interrupt line.\n");
                me_subdevice_deinit((me_subdevice_t *) subdevice);

diff --git a/drivers/staging/meilhaus/me4600_ext_irq.c b/drivers/staging/meilhaus/me4600_ext_irq.c
index 6b33cba..082a6e8 100644 (file)
--- a/drivers/staging/meilhaus/me4600_ext_irq.c
+++ b/drivers/staging/meilhaus/me4600_ext_irq.c
@@ -420,11 +420,7 @@ me4600_ext_irq_subdevice_t *me4600_ext_irq_constructor(uint32_t reg_base,
        subdevice->irq = irq;
 
        if (request_irq(subdevice->irq, me4600_ext_irq_isr,
-#ifdef IRQF_DISABLED
                        IRQF_DISABLED | IRQF_SHARED,
-#else
-                       SA_INTERRUPT | SA_SHIRQ,
-#endif
                        ME4600_NAME, subdevice)) {
                PERROR("Cannot register interrupt.\n");
                kfree(subdevice);

diff --git a/drivers/staging/meilhaus/me6000_ao.c b/drivers/staging/meilhaus/me6000_ao.c
index f7abdbd..66652dc 100644 (file)
--- a/drivers/staging/meilhaus/me6000_ao.c
+++ b/drivers/staging/meilhaus/me6000_ao.c
@@ -2627,11 +2627,7 @@ me6000_ao_subdevice_t *me6000_ao_constructor(uint32_t reg_base,
        if (subdevice->fifo & ME6000_AO_HAS_FIFO) {
                subdevice->irq = irq;
                if (request_irq(subdevice->irq, me6000_ao_isr,
-#ifdef IRQF_DISABLED
                                IRQF_DISABLED | IRQF_SHARED,
-#else
-                               SA_INTERRUPT | SA_SHIRQ,
-#endif
                                ME6000_NAME, subdevice)) {
                        PERROR("Cannot get interrupt line.\n");
                        PDEBUG("free circ_buf = %p size=%d",

diff --git a/drivers/staging/meilhaus/me8100_di.c b/drivers/staging/meilhaus/me8100_di.c
index 301dbd8..7bd7b7f 100644 (file)
--- a/drivers/staging/meilhaus/me8100_di.c
+++ b/drivers/staging/meilhaus/me8100_di.c
@@ -633,11 +633,7 @@ me8100_di_subdevice_t *me8100_di_constructor(uint32_t me8100_reg_base,
        /* Register interrupt service routine. */
        subdevice->irq = irq;
        err = request_irq(subdevice->irq, me8100_isr,
-#ifdef IRQF_DISABLED
                          IRQF_DISABLED | IRQF_SHARED,
-#else
-                         SA_INTERRUPT | SA_SHIRQ,
-#endif
                          ME8100_NAME, (void *)subdevice);
 
        if (err) {

diff --git a/drivers/staging/meilhaus/me8200_di.c b/drivers/staging/meilhaus/me8200_di.c
index a931fb8..cc1965b 100644 (file)
--- a/drivers/staging/meilhaus/me8200_di.c
+++ b/drivers/staging/meilhaus/me8200_di.c
@@ -801,19 +801,11 @@ me8200_di_subdevice_t *me8200_di_constructor(uint32_t me8200_regbase,
        subdevice->irq = irq;
        if (subdevice->version > 0) {   // NEW
                err = request_irq(subdevice->irq, me8200_isr_EX,
-#ifdef IRQF_DISABLED
                                  IRQF_DISABLED | IRQF_SHARED,
-#else
-                                 SA_INTERRUPT | SA_SHIRQ,
-#endif
                                  ME8200_NAME, (void *)subdevice);
        } else {                //OLD
                err = request_irq(subdevice->irq, me8200_isr,
-#ifdef IRQF_DISABLED
                                  IRQF_DISABLED | IRQF_SHARED,
-#else
-                                 SA_INTERRUPT | SA_SHIRQ,
-#endif
                                  ME8200_NAME, (void *)subdevice);
        }
 

diff --git a/drivers/staging/meilhaus/me8200_do.c b/drivers/staging/meilhaus/me8200_do.c
index 40d536c..3cec9b6 100644 (file)
--- a/drivers/staging/meilhaus/me8200_do.c
+++ b/drivers/staging/meilhaus/me8200_do.c
@@ -556,11 +556,7 @@ me8200_do_subdevice_t *me8200_do_constructor(uint32_t reg_base,
 
        /* Request the interrupt line */
        err = request_irq(irq, me8200_do_isr,
-#ifdef IRQF_DISABLED
                          IRQF_DISABLED | IRQF_SHARED,
-#else
-                         SA_INTERRUPT | SA_SHIRQ,
-#endif
                          ME8200_NAME, (void *)subdevice);
 
        if (err) {