[Acx100-devel] [PATCH 09/12] compat: #define irq_set_irq_type set_irq_type for kernels < 2.6.39

[Jim C. <jim...@gm...>]

acx_compat.h: add a #define irq_set_irq_type set_irq_type
Use it to drop 2 #if/#else/#endifs in pci.c mem.c

Signed-off-by: Jim Cromie <jim...@gm...>
---
 acx_compat.h |    5 +++++
 mem.c        |    5 +----
 pci.c        |    4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/acx_compat.h b/acx_compat.h
index dba1040..c05de45 100644
--- a/acx_compat.h
+++ b/acx_compat.h
@@ -57,3 +57,8 @@ do { \
 #  define OP_TX_RET_TYPE void
 #  define OP_TX_RET_OK   /* void */
 #endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
+/* map new name to old */
+#  define irq_set_irq_type set_irq_type
+#endif
diff --git a/mem.c b/mem.c
index c331231..feb8719 100644
--- a/mem.c
+++ b/mem.c
@@ -2138,11 +2138,8 @@ static int __devinit acxmem_probe(struct platform_device *pdev)
 		result = -EAGAIN;
 		goto fail_request_irq;
 	}
-	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
-	set_irq_type(adev->irq, IRQF_TRIGGER_FALLING);
-	#else
 	irq_set_irq_type(adev->irq, IRQF_TRIGGER_FALLING);
-	#endif
+
 	log(L_ANY, "request_irq %d successful\n", adev->irq);
 	/* Acx irqs shall be off and are enabled later in acx_up */
 	acxmem_lock();
diff --git a/pci.c b/pci.c
index e29b8be..19df744 100644
--- a/pci.c
+++ b/pci.c
@@ -1727,11 +1727,7 @@ static __devinit int vlynq_probe(struct vlynq_device *vdev,
 	vlynq_set_local_mapping(vdev, vdev->mem_start, mapping);
 	vlynq_set_remote_mapping(vdev, 0, match->rx_mapping);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)
-	set_irq_type(vlynq_virq_to_irq(vdev, match->irq), match->irq_type);
-#else
 	irq_set_irq_type(vlynq_virq_to_irq(vdev, match->irq), match->irq_type);
-#endif
 
 	addr = (u32)ioremap(vdev->mem_start, 0x1000);
 	if (!addr) {
-- 
1.7.7.6