summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 05b4bd8)
raw | patch | inline | side by side (parent: 05b4bd8)
author | Angela Stegmaier <angelabaker@ti.com> | |
Wed, 11 Sep 2019 18:11:24 +0000 (13:11 -0500) | ||
committer | Angela Stegmaier <angelabaker@ti.com> | |
Wed, 11 Sep 2019 19:27:12 +0000 (14:27 -0500) |
This patch fixes the following build issues seen in rt-linux builds:
linux/encoder/vxe_v4l2.c: In function 'soft_thread_irq':
linux/encoder/vxe_v4l2.c:1599:10: error: 'IRQ_HANDLED' undeclared (first use in this function); did you mean 'OSA_IRQ_HANDLED'?
return IRQ_HANDLED;
^~~~~~~~~~~
OSA_IRQ_HANDLED
linux/encoder/vxe_v4l2.c:1599:10: note: each undeclared identifier is reported only once for each function it appears in
linux/encoder/vxe_v4l2.c:1601:9: error: 'IRQ_NONE' undeclared (first use in this function); did you mean 'WBI_NONE'?
return IRQ_NONE;
^~~~~~~~
WBI_NONE
linux/encoder/vxe_v4l2.c: In function 'vxe_enc_probe':
linux/encoder/vxe_v4l2.c:1677:3: error: implicit declaration of function 'free_irq'; did you mean 'free_uid'? [-Werror=implicit-function-declaration]
free_irq(module_irq, &vxe->topaz_dev_ctx);
^~~~~~~~
free_uid
linux/encoder/vxe_v4l2.c: In function 'soft_thread_irq':
linux/encoder/vxe_v4l2.c:1602:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
linux/encoder/vxe_v4l2.c: In function 'soft_thread_irq':
linux/encoder/vxe_v4l2.c:1599:10: error: 'IRQ_HANDLED' undeclared (first use in this function); did you mean 'OSA_IRQ_HANDLED'?
return IRQ_HANDLED;
^~~~~~~~~~~
OSA_IRQ_HANDLED
linux/encoder/vxe_v4l2.c:1599:10: note: each undeclared identifier is reported only once for each function it appears in
linux/encoder/vxe_v4l2.c:1601:9: error: 'IRQ_NONE' undeclared (first use in this function); did you mean 'WBI_NONE'?
return IRQ_NONE;
^~~~~~~~
WBI_NONE
linux/encoder/vxe_v4l2.c: In function 'vxe_enc_probe':
linux/encoder/vxe_v4l2.c:1677:3: error: implicit declaration of function 'free_irq'; did you mean 'free_uid'? [-Werror=implicit-function-declaration]
free_irq(module_irq, &vxe->topaz_dev_ctx);
^~~~~~~~
free_uid
linux/encoder/vxe_v4l2.c: In function 'soft_thread_irq':
linux/encoder/vxe_v4l2.c:1602:1: warning: control reaches end of non-void function [-Wreturn-type]
}
^
Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
linux/encoder/vxe_v4l2.c | patch | blob | history |
index c4ac3b2bde2d3ed7d6b75795e6ce05d40957130d..49e302b774c5dcef5c96f22c3ed8624a9a484831 100644 (file)
--- a/linux/encoder/vxe_v4l2.c
+++ b/linux/encoder/vxe_v4l2.c
handled = topazdd_threaded_isr(dev_data);
if (handled)
- return IRQ_HANDLED;
+ return OSA_IRQ_HANDLED;
- return IRQ_NONE;
+ return OSA_IRQ_NONE;
}
static osa_irqreturn_t hard_isrcb(int32 irq, void *dev_data)
ctx = osa_zalloc(sizeof(*ctx), OSA_GFP_KERNEL);
if (!ctx) {
- free_irq(module_irq, &vxe->topaz_dev_ctx);
+ osa_free_irq(module_irq, &vxe->topaz_dev_ctx);
return -OSA_ENOMEM;
}
ctx->dev = vxe;
topazdd_deinit(vxe->topaz_dev_ctx);
out_free_irq:
osa_free(vxe->ctx);
- free_irq(module_irq, &vxe->topaz_dev_ctx);
+ osa_free_irq(module_irq, &vxe->topaz_dev_ctx);
out_put_sync:
pm_runtime_put_sync(&pdev->dev);
osa_free(vxe->ctx);
vxe_deinit_mem();
- free_irq(vxe->module_irq, &vxe->topaz_dev_ctx);
+ osa_free_irq(vxe->module_irq, &vxe->topaz_dev_ctx);
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);