From 8532b9f985b1be7dff1f66eff7c304c30651762b Mon Sep 17 00:00:00 2001 From: Daniel Scheller Date: Sun, 27 Aug 2017 18:25:40 +0200 Subject: [PATCH] ddbridge: prefix irq_handler*() with ddb_ Make the very generic irq_handler*() function names less prone for name conflicts when the driver is being compiled into the kernel blob by prefixing the function names with ddb_. Backported from mainline driver variant. Having the modules from dddvb compiled into the kernel image is extremely unlikely, but lets keep things in sync abit anyway. This doesn't introduce any change in function. --- 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 95ce288..db45c3d 100644 --- a/ddbridge/ddbridge-core.c +++ b/ddbridge/ddbridge-core.c @@ -3358,7 +3358,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); @@ -3375,7 +3375,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); @@ -3392,7 +3392,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); @@ -3471,7 +3471,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 7e39ebc..0344f35 100644 --- a/ddbridge/ddbridge-main.c +++ b/ddbridge/ddbridge-main.c @@ -149,7 +149,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; @@ -187,11 +187,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); @@ -199,12 +199,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 fcf4556..bc4bff1 100644 --- a/ddbridge/ddbridge.h +++ b/ddbridge/ddbridge.h @@ -562,10 +562,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 a1865f8..77dbb9c 100644 --- a/ddbridge/octonet-main.c +++ b/ddbridge/octonet-main.c @@ -113,7 +113,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;