Skip to content

Commit

Permalink
V4L/DVB: tlg2300: cleanups when power management is not configured
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Márton Németh authored and Mauro Carvalho Chehab committed May 18, 2010
1 parent d044189 commit 6c9eaa8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/media/video/tlg2300/pd-dvb.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,17 @@ static int poseidon_ts_bus_ctrl(struct dvb_frontend *fe, int acquire)
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;
#endif
}
#else
#define poseidon_fe_release NULL
#endif

static s32 poseidon_fe_sleep(struct dvb_frontend *fe)
{
Expand Down
2 changes: 2 additions & 0 deletions drivers/media/video/tlg2300/pd-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,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;
Expand Down

0 comments on commit 6c9eaa8

Please sign in to comment.