frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2023-10-10 13:37:43 +02:00
Code Issues Releases Wiki Activity

ddbridge: prefix irq_handler*() with ddb_

Browse Source 
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.
This commit is contained in:
Daniel Scheller 2017-08-27 18:25:40 +02:00
parent 5751c3fb1a
commit 8532b9f985
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ddbridge/ddbridge-core.c
View File

@ -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; struct ddb *dev = (struct ddb *) dev_id;
u32 s = ddbreadl(dev, INTERRUPT_STATUS); u32 s = ddbreadl(dev, INTERRUPT_STATUS);
@ -3375,7 +3375,7 @@ irqreturn_t irq_handler0(int irq, void *dev_id)
return IRQ_HANDLED; 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; struct ddb *dev = (struct ddb *) dev_id;
u32 s = ddbreadl(dev, INTERRUPT_STATUS); u32 s = ddbreadl(dev, INTERRUPT_STATUS);
@ -3392,7 +3392,7 @@ irqreturn_t irq_handler1(int irq, void *dev_id)
return IRQ_HANDLED; 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; struct ddb *dev = (struct ddb *) dev_id;
u32 s = ddbreadl(dev, INTERRUPT_STATUS); 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; 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; struct ddb *dev = (struct ddb *) dev_id;
u32 s = 0xffff & ddbreadl(dev, INTERRUPT_V2_STATUS); u32 s = 0xffff & ddbreadl(dev, INTERRUPT_V2_STATUS);

10
ddbridge/ddbridge-main.c
View File

@ -149,7 +149,7 @@ static int __devinit ddb_irq_init2(struct ddb *dev)
if (dev->msi) if (dev->msi)
irq_flag = 0; 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); irq_flag, "ddbridge", (void *) dev);
if (stat < 0) if (stat < 0)
return stat; return stat;
@ -187,11 +187,11 @@ static int __devinit ddb_irq_init(struct ddb *dev)
if (dev->msi) if (dev->msi)
irq_flag = 0; irq_flag = 0;
if (dev->msi == 2) { 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); irq_flag, "ddbridge", (void *) dev);
if (stat < 0) if (stat < 0)
return stat; 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); irq_flag, "ddbridge", (void *) dev);
if (stat < 0) { if (stat < 0) {
free_irq(dev->pdev->irq, dev); free_irq(dev->pdev->irq, dev);
@ -199,12 +199,12 @@ static int __devinit ddb_irq_init(struct ddb *dev)
} }
} else { } else {
#ifdef DDB_TEST_THREADED #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_thread,
irq_flag, irq_flag,
"ddbridge", (void *) dev); "ddbridge", (void *) dev);
#else #else
stat = request_irq(dev->pdev->irq, irq_handler, stat = request_irq(dev->pdev->irq, ddb_irq_handler,
irq_flag, "ddbridge", (void *) dev); irq_flag, "ddbridge", (void *) dev);
#endif #endif
if (stat < 0) if (stat < 0)

8
ddbridge/ddbridge.h
View File

@ -562,10 +562,10 @@ void ddb_ports_detach(struct ddb *dev);
void ddb_ports_release(struct ddb *dev); void ddb_ports_release(struct ddb *dev);
void ddb_buffers_free(struct ddb *dev); void ddb_buffers_free(struct ddb *dev);
void ddb_unmap(struct ddb *dev); void ddb_unmap(struct ddb *dev);
irqreturn_t irq_handler0(int irq, void *dev_id); irqreturn_t ddb_irq_handler0(int irq, void *dev_id);
irqreturn_t irq_handler1(int irq, void *dev_id); irqreturn_t ddb_irq_handler1(int irq, void *dev_id);
irqreturn_t irq_handler(int irq, void *dev_id); irqreturn_t ddb_irq_handler(int irq, void *dev_id);
irqreturn_t irq_handler_v2(int irq, void *dev_id); irqreturn_t ddb_irq_handler_v2(int irq, void *dev_id);
void ddb_reset_ios(struct ddb *dev); void ddb_reset_ios(struct ddb *dev);
int ddb_init(struct ddb *dev); int ddb_init(struct ddb *dev);
int ddb_class_create(void); int ddb_class_create(void);

2
ddbridge/octonet-main.c
View File

@ -113,7 +113,7 @@ static int __init octonet_probe(struct platform_device *pdev)
irq = platform_get_irq(dev->pfdev, 0); irq = platform_get_irq(dev->pfdev, 0);
if (irq < 0) if (irq < 0)
goto fail; goto fail;
if (request_irq(irq, irq_handler, if (request_irq(irq, ddb_irq_handler,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
"octonet-dvb", (void *) dev) < 0) "octonet-dvb", (void *) dev) < 0)
goto fail; goto fail;