The patch number 14403 was added via Douglas Schilling Landgraf
<[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <[email protected]>
------
From: M?rton N?meth <[email protected]>
tlg2300: cleanups when power management is not configured
When power management is not configured (CONFIG_PM) then some code is no longer
necessary.
This patch will remove the following compiler warnings:
* pd-dvb.c: In function 'poseidon_fe_release':
* pd-dvb.c:101: warning: unused variable 'pd'
* pd-video.c:14: warning: 'pm_video_suspend' declared 'static' but never defined
* pd-video.c:15: warning: 'pm_video_resume' declared 'static' but never defined
Priority: normal
Signed-off-by: M?rton N?meth <[email protected]>
Acked-by: Huang Shijie <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Douglas Schilling Landgraf <[email protected]>
---
linux/drivers/media/video/tlg2300/pd-dvb.c | 6 ++++--
linux/drivers/media/video/tlg2300/pd-video.c | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff -r 1232210aa632 -r a0d80f3fe7d1 linux/drivers/media/video/tlg2300/pd-dvb.c
--- a/linux/drivers/media/video/tlg2300/pd-dvb.c Sat Mar 06 22:03:33
2010 -0300
+++ b/linux/drivers/media/video/tlg2300/pd-dvb.c Sat Mar 06 22:06:44
2010 -0300
@@ -96,15 +96,17 @@
return ret;
}
+#ifdef CONFIG_PM
static void poseidon_fe_release(struct dvb_frontend *fe)
{
struct poseidon *pd = fe->demodulator_priv;
-#ifdef CONFIG_PM
pd->pm_suspend = NULL;
pd->pm_resume = NULL;
+}
+#else
+#define poseidon_fe_release NULL
#endif
-}
static s32 poseidon_fe_sleep(struct dvb_frontend *fe)
{
diff -r 1232210aa632 -r a0d80f3fe7d1
linux/drivers/media/video/tlg2300/pd-video.c
--- a/linux/drivers/media/video/tlg2300/pd-video.c Sat Mar 06 22:03:33
2010 -0300
+++ b/linux/drivers/media/video/tlg2300/pd-video.c Sat Mar 06 22:06:44
2010 -0300
@@ -11,8 +11,10 @@
#include "pd-common.h"
#include "vendorcmds.h"
+#ifdef CONFIG_PM
static int pm_video_suspend(struct poseidon *pd);
static int pm_video_resume(struct poseidon *pd);
+#endif
static void iso_bubble_handler(struct work_struct *w);
int usb_transfer_mode;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/a0d80f3fe7d1e20813f918fbf80042103bf5bc81
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
