Staging: meilhaus: remove dependence on kernel version

[~andy/linux] / drivers / staging / meilhaus / me1400_ext_irq.c

diff --git a/drivers/staging/meilhaus/me1400_ext_irq.c b/drivers/staging/meilhaus/me1400_ext_irq.c
index b8c2696bc1500af0c0dc8e0a01528822f33cb3a6..766e42d85940bf31ca4ae0fbc19c92ef703b4629 100644 (file)
--- a/drivers/staging/meilhaus/me1400_ext_irq.c
+++ b/drivers/staging/meilhaus/me1400_ext_irq.c
@@ -323,12 +323,7 @@ static int me1400_ext_irq_query_subdevice_caps_args(struct me_subdevice
        return ME_ERRNO_NOT_SUPPORTED;
 }
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)
 static irqreturn_t me1400_ext_irq_isr(int irq, void *dev_id)
-#else
-static irqreturn_t me1400_ext_irq_isr(int irq, void *dev_id,
-                                     struct pt_regs *regs)
-#endif
 {
        me1400_ext_irq_subdevice_t *instance;
        uint32_t status;
@@ -349,7 +344,7 @@ static irqreturn_t me1400_ext_irq_isr(int irq, void *dev_id,
            (PLX_LOCAL_INT1_STATE | PLX_LOCAL_INT1_EN | PLX_PCI_INT_EN)) {
                spin_unlock(&instance->subdevice_lock);
                PINFO("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n",
-                     jiffies, __FUNCTION__, status);
+                     jiffies, __func__, status);
                return IRQ_NONE;
        }