2018-09-26 13:02:51

by Arnd Bergmann

Subject: [PATCH] media: imx-pxp: include linux/interrupt.h

The newly added driver fails to build in some configurations due to a
missing header inclusion:

drivers/media/platform/imx-pxp.c:988:8: error: unknown type name 'irqreturn_t'
static irqreturn_t pxp_irq_handler(int irq, void *dev_id)
^~~~~~~~~~~
drivers/media/platform/imx-pxp.c: In function 'pxp_irq_handler':
drivers/media/platform/imx-pxp.c:1012:9: error: 'IRQ_HANDLED' undeclared (first use in this function); did you mean 'IRQ_MODE'?
return IRQ_HANDLED;
^~~~~~~~~~~
IRQ_MODE
drivers/media/platform/imx-pxp.c:1012:9: note: each undeclared identifier is reported only once for each function it appears in
drivers/media/platform/imx-pxp.c: In function 'pxp_probe':
drivers/media/platform/imx-pxp.c:1660:8: error: implicit declaration of function 'devm_request_threaded_irq'; did you mean 'devm_request_region'? [-Werror=implicit-function-declaration]
ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, pxp_irq_handler,
^~~~~~~~~~~~~~~~~~~~~~~~~
devm_request_region
drivers/media/platform/imx-pxp.c:1661:4: error: 'IRQF_ONESHOT' undeclared (first use in this function); did you mean 'SA_ONESHOT'?
IRQF_ONESHOT, dev_name(&pdev->dev), dev);

Fixes: 51abcf7fdb70 ("media: imx-pxp: add i.MX Pixel Pipeline driver")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/media/platform/imx-pxp.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c
index 229c23ae4029..b76cd0e8313c 100644
--- a/drivers/media/platform/imx-pxp.c
+++ b/drivers/media/platform/imx-pxp.c
@@ -16,6 +16,7 @@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/iopoll.h>
+#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/sched.h>
--
2.18.0

2018-09-26 13:38:16

by Philipp Zabel

Subject: Re: [PATCH] media: imx-pxp: include linux/interrupt.h

Hi Arnd,

On Wed, Sep 26, 2018 at 03:01:26PM +0200, Arnd Bergmann wrote:
> The newly added driver fails to build in some configurations due to a
> missing header inclusion:

Thank you, did you see this error on an older kernel version and rebase
the patch afterwards?

> drivers/media/platform/imx-pxp.c:988:8: error: unknown type name 'irqreturn_t'
> static irqreturn_t pxp_irq_handler(int irq, void *dev_id)
> ^~~~~~~~~~~
> drivers/media/platform/imx-pxp.c: In function 'pxp_irq_handler':
> drivers/media/platform/imx-pxp.c:1012:9: error: 'IRQ_HANDLED' undeclared (first use in this function); did you mean 'IRQ_MODE'?
> return IRQ_HANDLED;
> ^~~~~~~~~~~
> IRQ_MODE
> drivers/media/platform/imx-pxp.c:1012:9: note: each undeclared identifier is reported only once for each function it appears in
> drivers/media/platform/imx-pxp.c: In function 'pxp_probe':
> drivers/media/platform/imx-pxp.c:1660:8: error: implicit declaration of function 'devm_request_threaded_irq'; did you mean 'devm_request_region'? [-Werror=implicit-function-declaration]
> ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, pxp_irq_handler,
> ^~~~~~~~~~~~~~~~~~~~~~~~~
> devm_request_region
> drivers/media/platform/imx-pxp.c:1661:4: error: 'IRQF_ONESHOT' undeclared (first use in this function); did you mean 'SA_ONESHOT'?
> IRQF_ONESHOT, dev_name(&pdev->dev), dev);
>
> Fixes: 51abcf7fdb70 ("media: imx-pxp: add i.MX Pixel Pipeline driver")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/media/platform/imx-pxp.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c
> index 229c23ae4029..b76cd0e8313c 100644
> --- a/drivers/media/platform/imx-pxp.c
> +++ b/drivers/media/platform/imx-pxp.c
> @@ -16,6 +16,7 @@
> #include <linux/interrupt.h>

This line was recently added in commit b4fbf423cef9 ("media: imx-pxp:
fix compilation on i386 or x86_64")

> #include <linux/io.h>
> #include <linux/iopoll.h>
> +#include <linux/interrupt.h>

So this should not be necessary anymore.

> #include <linux/module.h>
> #include <linux/of.h>
> #include <linux/sched.h>
> --
> 2.18.0
>
>

regards
Philipp

2018-09-26 14:04:04

by Arnd Bergmann

Subject: Re: [PATCH] media: imx-pxp: include linux/interrupt.h

On Wed, Sep 26, 2018 at 3:37 PM Philipp Zabel <[email protected]> wrote:
>
> Hi Arnd,
>
> On Wed, Sep 26, 2018 at 03:01:26PM +0200, Arnd Bergmann wrote:
> > The newly added driver fails to build in some configurations due to a
> > missing header inclusion:
>
> Thank you, did you see this error on an older kernel version and rebase
> the patch afterwards?

Yes, sorry about that. I created my patch yesterday, but apparently
this was on next-20180913 rather than the current one.

Arnd