From 07f7720145ef4927cad30ce9f1612c87102a5ab8 Mon Sep 17 00:00:00 2001
From: Ralph Metzler <rjkm@metzlerbros.de>
Date: Sun, 27 Aug 2017 21:42:02 +0200
Subject: [PATCH] prefix irq handlers with ddb_ to avoid name collisions

---
 ddbridge/ddbridge-core.c |  8 ++++----
 ddbridge/ddbridge-main.c | 10 +++++-----
 ddbridge/ddbridge.h      |  8 ++++----
 ddbridge/octonet-main.c  |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ddbridge/ddbridge-core.c b/ddbridge/ddbridge-core.c
index a8e582e..1e40c39 100644
--- a/ddbridge/ddbridge-core.c
+++ b/ddbridge/ddbridge-core.c
@@ -3359,7 +3359,7 @@ static void irq_handle_io(struct ddb *dev, u32 s)
 	}
 }
 
-irqreturn_t irq_handler0(int irq, void *dev_id)
+irqreturn_t ddb_irq_handler0(int irq, void *dev_id)
 {
 	struct ddb *dev = (struct ddb *)dev_id;
 	u32 s = ddbreadl(dev, INTERRUPT_STATUS);
@@ -3376,7 +3376,7 @@ irqreturn_t irq_handler0(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t irq_handler1(int irq, void *dev_id)
+irqreturn_t ddb_irq_handler1(int irq, void *dev_id)
 {
 	struct ddb *dev = (struct ddb *)dev_id;
 	u32 s = ddbreadl(dev, INTERRUPT_STATUS);
@@ -3393,7 +3393,7 @@ irqreturn_t irq_handler1(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t irq_handler(int irq, void *dev_id)
+irqreturn_t ddb_irq_handler(int irq, void *dev_id)
 {
 	struct ddb *dev = (struct ddb *)dev_id;
 	u32 s = ddbreadl(dev, INTERRUPT_STATUS);
@@ -3472,7 +3472,7 @@ static irqreturn_t irq_handle_v2_n(struct ddb *dev, u32 n)
 	return IRQ_HANDLED;
 }
 
-irqreturn_t irq_handler_v2(int irq, void *dev_id)
+irqreturn_t ddb_irq_handler_v2(int irq, void *dev_id)
 {
 	struct ddb *dev = (struct ddb *)dev_id;
 	u32 s = 0xffff & ddbreadl(dev, INTERRUPT_V2_STATUS);
diff --git a/ddbridge/ddbridge-main.c b/ddbridge/ddbridge-main.c
index 639cf15..8d5fca1 100644
--- a/ddbridge/ddbridge-main.c
+++ b/ddbridge/ddbridge-main.c
@@ -147,7 +147,7 @@ static int __devinit ddb_irq_init2(struct ddb *dev)
 	if (dev->msi)
 		irq_flag = 0;
 
-	stat = request_irq(dev->pdev->irq, irq_handler_v2,
+	stat = request_irq(dev->pdev->irq, ddb_irq_handler_v2,
 			   irq_flag, "ddbridge", (void *)dev);
 	if (stat < 0)
 		return stat;
@@ -185,11 +185,11 @@ static int __devinit ddb_irq_init(struct ddb *dev)
 	if (dev->msi)
 		irq_flag = 0;
 	if (dev->msi == 2) {
-		stat = request_irq(dev->pdev->irq, irq_handler0,
+		stat = request_irq(dev->pdev->irq, ddb_irq_handler0,
 				   irq_flag, "ddbridge", (void *)dev);
 		if (stat < 0)
 			return stat;
-		stat = request_irq(dev->pdev->irq + 1, irq_handler1,
+		stat = request_irq(dev->pdev->irq + 1, ddb_irq_handler1,
 				   irq_flag, "ddbridge", (void *)dev);
 		if (stat < 0) {
 			free_irq(dev->pdev->irq, dev);
@@ -197,12 +197,12 @@ static int __devinit ddb_irq_init(struct ddb *dev)
 		}
 	} else {
 #ifdef DDB_TEST_THREADED
-		stat = request_threaded_irq(dev->pdev->irq, irq_handler,
+		stat = request_threaded_irq(dev->pdev->irq, ddb_irq_handler,
 					    irq_thread,
 					    irq_flag,
 					    "ddbridge", (void *)dev);
 #else
-		stat = request_irq(dev->pdev->irq, irq_handler,
+		stat = request_irq(dev->pdev->irq, ddb_irq_handler,
 				   irq_flag, "ddbridge", (void *)dev);
 #endif
 		if (stat < 0)
diff --git a/ddbridge/ddbridge.h b/ddbridge/ddbridge.h
index 32a63a2..16b61f3 100644
--- a/ddbridge/ddbridge.h
+++ b/ddbridge/ddbridge.h
@@ -552,10 +552,10 @@ void ddb_ports_detach(struct ddb *dev);
 void ddb_ports_release(struct ddb *dev);
 void ddb_buffers_free(struct ddb *dev);
 void ddb_unmap(struct ddb *dev);
-irqreturn_t irq_handler0(int irq, void *dev_id);
-irqreturn_t irq_handler1(int irq, void *dev_id);
-irqreturn_t irq_handler(int irq, void *dev_id);
-irqreturn_t irq_handler_v2(int irq, void *dev_id);
+irqreturn_t ddb_irq_handler0(int irq, void *dev_id);
+irqreturn_t ddb_irq_handler1(int irq, void *dev_id);
+irqreturn_t ddb_irq_handler(int irq, void *dev_id);
+irqreturn_t ddb_irq_handler_v2(int irq, void *dev_id);
 void ddb_reset_ios(struct ddb *dev);
 int ddb_init(struct ddb *dev);
 int ddb_class_create(void);
diff --git a/ddbridge/octonet-main.c b/ddbridge/octonet-main.c
index bb49cd3..c7a3d1c 100644
--- a/ddbridge/octonet-main.c
+++ b/ddbridge/octonet-main.c
@@ -100,7 +100,7 @@ static int __init octonet_probe(struct platform_device *pdev)
 	irq = platform_get_irq(dev->pfdev, 0);
 	if (irq < 0)
 		goto fail;
-	if (request_irq(irq, irq_handler,
+	if (request_irq(irq, ddb_irq_handler,
 			IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
 			"octonet-dvb", (void *)dev) < 0)
 		goto fail;