* [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include
@ 2017-03-20 9:47 Arnd Bergmann
2017-03-20 9:47 ` [PATCH 2/2] [media] vcodec: mediatek: mark pm functions as __maybe_unused Arnd Bergmann
2017-03-21 1:22 ` [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include Rick Chang
0 siblings, 2 replies; 4+ messages in thread
From: Arnd Bergmann @ 2017-03-20 9:47 UTC (permalink / raw)
To: Rick Chang, Bin Liu, Mauro Carvalho Chehab
Cc: Arnd Bergmann, Matthias Brugger, Minghsiu Tsai, Ricky Liang,
linux-media, linux-arm-kernel, linux-mediatek, linux-kernel
With the newly added driver, I have run into randconfig failures like:
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c: In function 'mtk_jpeg_open':
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c:1017:8: error: implicit declaration of function 'kzalloc';did you mean 'kvzalloc'? [-Werror=implicit-function-declaration]
Including the header with the declaration solves the problem.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index b10183f7942b..f9bd58ce7d32 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -22,6 +22,7 @@
#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/slab.h>
#include <linux/spinlock.h>
#include <media/v4l2-event.h>
#include <media/v4l2-mem2mem.h>
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] [media] vcodec: mediatek: mark pm functions as __maybe_unused
2017-03-20 9:47 [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include Arnd Bergmann
@ 2017-03-20 9:47 ` Arnd Bergmann
2017-03-21 1:46 ` Rick Chang
2017-03-21 1:22 ` [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include Rick Chang
1 sibling, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2017-03-20 9:47 UTC (permalink / raw)
To: Rick Chang, Bin Liu, Mauro Carvalho Chehab
Cc: Arnd Bergmann, Matthias Brugger, Minghsiu Tsai, Ricky Liang,
linux-media, linux-arm-kernel, linux-mediatek, linux-kernel
When CONFIG_PM is disabled, we get a couple of unused functions:
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c:927:13: error: 'mtk_jpeg_clk_off' defined but not used [-Werror=unused-function]
static void mtk_jpeg_clk_off(struct mtk_jpeg_dev *jpeg)
^~~~~~~~~~~~~~~~
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c:916:13: error: 'mtk_jpeg_clk_on' defined but not used [-Werror=unused-function]
static void mtk_jpeg_clk_on(struct mtk_jpeg_dev *jpeg)
Rather than adding more error-prone #ifdefs around those, this patch
removes the existing #ifdef checks and marks the PM functions as __maybe_unused
to let gcc do the right thing.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index f9bd58ce7d32..7103b6da25d2 100644
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -1224,8 +1224,7 @@ static int mtk_jpeg_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
-static int mtk_jpeg_pm_suspend(struct device *dev)
+static __maybe_unused int mtk_jpeg_pm_suspend(struct device *dev)
{
struct mtk_jpeg_dev *jpeg = dev_get_drvdata(dev);
@@ -1235,7 +1234,7 @@ static int mtk_jpeg_pm_suspend(struct device *dev)
return 0;
}
-static int mtk_jpeg_pm_resume(struct device *dev)
+static __maybe_unused int mtk_jpeg_pm_resume(struct device *dev)
{
struct mtk_jpeg_dev *jpeg = dev_get_drvdata(dev);
@@ -1244,10 +1243,8 @@ static int mtk_jpeg_pm_resume(struct device *dev)
return 0;
}
-#endif /* CONFIG_PM */
-#ifdef CONFIG_PM_SLEEP
-static int mtk_jpeg_suspend(struct device *dev)
+static __maybe_unused int mtk_jpeg_suspend(struct device *dev)
{
int ret;
@@ -1258,7 +1255,7 @@ static int mtk_jpeg_suspend(struct device *dev)
return ret;
}
-static int mtk_jpeg_resume(struct device *dev)
+static __maybe_unused int mtk_jpeg_resume(struct device *dev)
{
int ret;
@@ -1269,7 +1266,6 @@ static int mtk_jpeg_resume(struct device *dev)
return ret;
}
-#endif /* CONFIG_PM_SLEEP */
static const struct dev_pm_ops mtk_jpeg_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(mtk_jpeg_suspend, mtk_jpeg_resume)
--
2.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include
2017-03-20 9:47 [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include Arnd Bergmann
2017-03-20 9:47 ` [PATCH 2/2] [media] vcodec: mediatek: mark pm functions as __maybe_unused Arnd Bergmann
@ 2017-03-21 1:22 ` Rick Chang
1 sibling, 0 replies; 4+ messages in thread
From: Rick Chang @ 2017-03-21 1:22 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Bin Liu, Mauro Carvalho Chehab, Matthias Brugger, Minghsiu Tsai,
Ricky Liang, linux-media, linux-arm-kernel, linux-mediatek,
linux-kernel, Hans Verkuil
Hi Arnd,
Thank you for the patch, but someone has fixed the same problem.
Regards,
Rick
On Mon, 2017-03-20 at 10:47 +0100, Arnd Bergmann wrote:
> With the newly added driver, I have run into randconfig failures like:
>
> drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c: In function 'mtk_jpeg_open':
> drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c:1017:8: error: implicit declaration of function 'kzalloc';did you mean 'kvzalloc'? [-Werror=implicit-function-declaration]
>
> Including the header with the declaration solves the problem.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> index b10183f7942b..f9bd58ce7d32 100644
> --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
> @@ -22,6 +22,7 @@
> #include <linux/of_platform.h>
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> +#include <linux/slab.h>
> #include <linux/spinlock.h>
> #include <media/v4l2-event.h>
> #include <media/v4l2-mem2mem.h>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] [media] vcodec: mediatek: mark pm functions as __maybe_unused
2017-03-20 9:47 ` [PATCH 2/2] [media] vcodec: mediatek: mark pm functions as __maybe_unused Arnd Bergmann
@ 2017-03-21 1:46 ` Rick Chang
0 siblings, 0 replies; 4+ messages in thread
From: Rick Chang @ 2017-03-21 1:46 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Bin Liu, Mauro Carvalho Chehab, Matthias Brugger, Minghsiu Tsai,
Ricky Liang, linux-media, linux-arm-kernel, linux-mediatek,
linux-kernel, Hans Verkuil
On Mon, 2017-03-20 at 10:47 +0100, Arnd Bergmann wrote:
> When CONFIG_PM is disabled, we get a couple of unused functions:
>
> drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c:927:13: error: 'mtk_jpeg_clk_off' defined but not used [-Werror=unused-function]
> static void mtk_jpeg_clk_off(struct mtk_jpeg_dev *jpeg)
> ^~~~~~~~~~~~~~~~
> drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c:916:13: error: 'mtk_jpeg_clk_on' defined but not used [-Werror=unused-function]
> static void mtk_jpeg_clk_on(struct mtk_jpeg_dev *jpeg)
>
> Rather than adding more error-prone #ifdefs around those, this patch
> removes the existing #ifdef checks and marks the PM functions as __maybe_unused
> to let gcc do the right thing.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
Acked-by: Rick Chang <rick.chang@mediatek.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-03-21 1:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-20 9:47 [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include Arnd Bergmann
2017-03-20 9:47 ` [PATCH 2/2] [media] vcodec: mediatek: mark pm functions as __maybe_unused Arnd Bergmann
2017-03-21 1:46 ` Rick Chang
2017-03-21 1:22 ` [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include Rick Chang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).