diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-02-12 16:02:29 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:11:02 -0500 |
commit | 08cf8a57c51da7db9633c2827b3dbabfb7df51fd (patch) | |
tree | 5c51426019b1a7319f984174e1ae2b8a12d5ad61 /drivers/media/video | |
parent | 546e29b66a1aeec3b6a710aceeb2149871570416 (diff) |
V4L/DVB: media/video/tlg2300: fix build when CONFIG_PM=n
When CONFIG_PM is not enabled, tlg2300 has build errors,
so handle that case, mostly via stubs.
drivers/media/video/tlg2300/pd-alsa.c:237: error: 'struct poseidon' has no member named 'msg'
drivers/media/video/tlg2300/pd-main.c:412: error: implicit declaration of function 'find_old_poseidon'
drivers/media/video/tlg2300/pd-main.c:418: error: implicit declaration of function 'set_map_flags'
drivers/media/video/tlg2300/pd-main.c:462: error: implicit declaration of function 'get_pd'
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>, linux-media@vger.kernel.org
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Huang Shijie <shijie8@gmail.com>
Cc: Kang Yong <kangyong@telegent.com>
Cc: Zhang Xiaobing <xbzhang@telegent.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/tlg2300/pd-common.h | 4 | ||||
-rw-r--r-- | drivers/media/video/tlg2300/pd-main.c | 19 |
2 files changed, 18 insertions, 5 deletions
diff --git a/drivers/media/video/tlg2300/pd-common.h b/drivers/media/video/tlg2300/pd-common.h index ae9cb6c581ac..46066bdc73f9 100644 --- a/drivers/media/video/tlg2300/pd-common.h +++ b/drivers/media/video/tlg2300/pd-common.h | |||
@@ -254,7 +254,11 @@ void destroy_video_device(struct video_device **v_dev); | |||
254 | extern int debug_mode; | 254 | extern int debug_mode; |
255 | void set_debug_mode(struct video_device *vfd, int debug_mode); | 255 | void set_debug_mode(struct video_device *vfd, int debug_mode); |
256 | 256 | ||
257 | #ifdef CONFIG_PM | ||
257 | #define in_hibernation(pd) (pd->msg.event == PM_EVENT_FREEZE) | 258 | #define in_hibernation(pd) (pd->msg.event == PM_EVENT_FREEZE) |
259 | #else | ||
260 | #define in_hibernation(pd) (0) | ||
261 | #endif | ||
258 | #define get_pm_count(p) (atomic_read(&(p)->interface->pm_usage_cnt)) | 262 | #define get_pm_count(p) (atomic_read(&(p)->interface->pm_usage_cnt)) |
259 | 263 | ||
260 | #define log(a, ...) printk(KERN_DEBUG "\t[ %s : %.3d ] "a"\n", \ | 264 | #define log(a, ...) printk(KERN_DEBUG "\t[ %s : %.3d ] "a"\n", \ |
diff --git a/drivers/media/video/tlg2300/pd-main.c b/drivers/media/video/tlg2300/pd-main.c index fdcc5007a701..2cf0ebf9f28b 100644 --- a/drivers/media/video/tlg2300/pd-main.c +++ b/drivers/media/video/tlg2300/pd-main.c | |||
@@ -255,6 +255,11 @@ out: | |||
255 | return ret; | 255 | return ret; |
256 | } | 256 | } |
257 | 257 | ||
258 | static inline struct poseidon *get_pd(struct usb_interface *intf) | ||
259 | { | ||
260 | return usb_get_intfdata(intf); | ||
261 | } | ||
262 | |||
258 | #ifdef CONFIG_PM | 263 | #ifdef CONFIG_PM |
259 | /* one-to-one map : poseidon{} <----> usb_device{}'s port */ | 264 | /* one-to-one map : poseidon{} <----> usb_device{}'s port */ |
260 | static inline void set_map_flags(struct poseidon *pd, struct usb_device *udev) | 265 | static inline void set_map_flags(struct poseidon *pd, struct usb_device *udev) |
@@ -303,11 +308,6 @@ static inline int is_working(struct poseidon *pd) | |||
303 | return get_pm_count(pd) > 0; | 308 | return get_pm_count(pd) > 0; |
304 | } | 309 | } |
305 | 310 | ||
306 | static inline struct poseidon *get_pd(struct usb_interface *intf) | ||
307 | { | ||
308 | return usb_get_intfdata(intf); | ||
309 | } | ||
310 | |||
311 | static int poseidon_suspend(struct usb_interface *intf, pm_message_t msg) | 311 | static int poseidon_suspend(struct usb_interface *intf, pm_message_t msg) |
312 | { | 312 | { |
313 | struct poseidon *pd = get_pd(intf); | 313 | struct poseidon *pd = get_pd(intf); |
@@ -366,6 +366,15 @@ static void hibernation_resume(struct work_struct *w) | |||
366 | if (pd->pm_resume) | 366 | if (pd->pm_resume) |
367 | pd->pm_resume(pd); | 367 | pd->pm_resume(pd); |
368 | } | 368 | } |
369 | #else /* CONFIG_PM is not enabled: */ | ||
370 | static inline struct poseidon *find_old_poseidon(struct usb_device *udev) | ||
371 | { | ||
372 | return NULL; | ||
373 | } | ||
374 | |||
375 | static inline void set_map_flags(struct poseidon *pd, struct usb_device *udev) | ||
376 | { | ||
377 | } | ||
369 | #endif | 378 | #endif |
370 | 379 | ||
371 | static bool check_firmware(struct usb_device *udev, int *down_firmware) | 380 | static bool check_firmware(struct usb_device *udev, int *down_firmware) |