Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1604313 > unrolled thread
| Started by | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| First post | 2017-03-20 11:00 +0100 |
| Last post | 2017-03-21 02:30 +0100 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include Arnd Bergmann <arnd@arndb.de> - 2017-03-20 11:00 +0100
[PATCH 2/2] [media] vcodec: mediatek: mark pm functions as __maybe_unused Arnd Bergmann <arnd@arndb.de> - 2017-03-20 11:00 +0100
Re: [PATCH 2/2] [media] vcodec: mediatek: mark pm functions as __maybe_unused Rick Chang <rick.chang@mediatek.com> - 2017-03-21 02:50 +0100
Re: [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include Rick Chang <rick.chang@mediatek.com> - 2017-03-21 02:30 +0100
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2017-03-20 11:00 +0100 |
| Subject | [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include |
| Message-ID | <tn2gz-2R9-51@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2017-03-20 11:00 +0100 |
| Subject | [PATCH 2/2] [media] vcodec: mediatek: mark pm functions as __maybe_unused |
| Message-ID | <tn2gA-2R9-61@gated-at.bofh.it> |
| In reply to | #1604313 |
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
[toc] | [prev] | [next] | [standalone]
| From | Rick Chang <rick.chang@mediatek.com> |
|---|---|
| Date | 2017-03-21 02:50 +0100 |
| Subject | Re: [PATCH 2/2] [media] vcodec: mediatek: mark pm functions as __maybe_unused |
| Message-ID | <tnh5U-4MQ-5@gated-at.bofh.it> |
| In reply to | #1604316 |
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>
[toc] | [prev] | [next] | [standalone]
| From | Rick Chang <rick.chang@mediatek.com> |
|---|---|
| Date | 2017-03-21 02:30 +0100 |
| Subject | Re: [PATCH 1/2] [media] vcodec: mediatek: add missing linux/slab.h include |
| Message-ID | <tngMx-4Et-7@gated-at.bofh.it> |
| In reply to | #1604313 |
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>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web