diff options
author | Márton Németh <nm127@freemail.hu> | 2010-02-28 09:19:47 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-17 23:46:24 -0400 |
commit | 6c9eaa82da53676db830572f5a41aa9ffea133a1 (patch) | |
tree | 1bb4d23f378c67e8a6407326312f82847b4fb150 /drivers/media/video/tlg2300 | |
parent | d044189dfea1e8329d63cb4e18815a7e92d2e049 (diff) |
V4L/DVB: 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
Signed-off-by: Márton Németh <nm127@freemail.hu>
Acked-by: Huang Shijie <shijie8@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/tlg2300')
-rw-r--r-- | drivers/media/video/tlg2300/pd-dvb.c | 6 | ||||
-rw-r--r-- | drivers/media/video/tlg2300/pd-video.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/video/tlg2300/pd-dvb.c b/drivers/media/video/tlg2300/pd-dvb.c index ebd9cb5bec74..edd78f8b1baa 100644 --- a/drivers/media/video/tlg2300/pd-dvb.c +++ b/drivers/media/video/tlg2300/pd-dvb.c | |||
@@ -97,15 +97,17 @@ open_out: | |||
97 | return ret; | 97 | return ret; |
98 | } | 98 | } |
99 | 99 | ||
100 | #ifdef CONFIG_PM | ||
100 | static void poseidon_fe_release(struct dvb_frontend *fe) | 101 | static void poseidon_fe_release(struct dvb_frontend *fe) |
101 | { | 102 | { |
102 | struct poseidon *pd = fe->demodulator_priv; | 103 | struct poseidon *pd = fe->demodulator_priv; |
103 | 104 | ||
104 | #ifdef CONFIG_PM | ||
105 | pd->pm_suspend = NULL; | 105 | pd->pm_suspend = NULL; |
106 | pd->pm_resume = NULL; | 106 | pd->pm_resume = NULL; |
107 | #endif | ||
108 | } | 107 | } |
108 | #else | ||
109 | #define poseidon_fe_release NULL | ||
110 | #endif | ||
109 | 111 | ||
110 | static s32 poseidon_fe_sleep(struct dvb_frontend *fe) | 112 | static s32 poseidon_fe_sleep(struct dvb_frontend *fe) |
111 | { | 113 | { |
diff --git a/drivers/media/video/tlg2300/pd-video.c b/drivers/media/video/tlg2300/pd-video.c index cf8f18c007e6..ed5cb1818adc 100644 --- a/drivers/media/video/tlg2300/pd-video.c +++ b/drivers/media/video/tlg2300/pd-video.c | |||
@@ -12,8 +12,10 @@ | |||
12 | #include "pd-common.h" | 12 | #include "pd-common.h" |
13 | #include "vendorcmds.h" | 13 | #include "vendorcmds.h" |
14 | 14 | ||
15 | #ifdef CONFIG_PM | ||
15 | static int pm_video_suspend(struct poseidon *pd); | 16 | static int pm_video_suspend(struct poseidon *pd); |
16 | static int pm_video_resume(struct poseidon *pd); | 17 | static int pm_video_resume(struct poseidon *pd); |
18 | #endif | ||
17 | static void iso_bubble_handler(struct work_struct *w); | 19 | static void iso_bubble_handler(struct work_struct *w); |
18 | 20 | ||
19 | int usb_transfer_mode; | 21 | int usb_transfer_mode; |