From patchwork Sun Feb 28 14:19:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOpbWV0aCBNw6FydG9u?= X-Patchwork-Id: 2858 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Sun, 28 Feb 2010 14:20:23 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Sun, 28 Feb 2010 11:21:25 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1Nlk0N-0007mN-8p; Sun, 28 Feb 2010 14:20:23 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968142Ab0B1OUS (ORCPT + 1 other); Sun, 28 Feb 2010 09:20:18 -0500 Received: from relay02.digicable.hu ([92.249.128.188]:39958 "EHLO relay02.digicable.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968032Ab0B1OUR (ORCPT ); Sun, 28 Feb 2010 09:20:17 -0500 Received: from [94.21.195.14] by relay02.digicable.hu with esmtpa id 1Nljzt-00033X-7n ; Sun, 28 Feb 2010 15:19:53 +0100 Message-ID: <4B8A7B83.8060203@freemail.hu> Date: Sun, 28 Feb 2010 15:19:47 +0100 From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU; rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16 MIME-Version: 1.0 To: Kang Yong , Zhang Xiaobing , Huang Shijie , Huang Shijie CC: V4L Mailing List Subject: [PATCH] tlg2300: cleanups when power management is not configured X-Original: 94.21.195.14 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Márton Németh 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 Acked-by: Huang Shijie --- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -r 37581bb7e6f1 linux/drivers/media/video/tlg2300/pd-dvb.c --- a/linux/drivers/media/video/tlg2300/pd-dvb.c Wed Feb 24 22:48:50 2010 -0300 +++ b/linux/drivers/media/video/tlg2300/pd-dvb.c Sun Feb 28 15:13:05 2010 +0100 @@ -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 37581bb7e6f1 linux/drivers/media/video/tlg2300/pd-video.c --- a/linux/drivers/media/video/tlg2300/pd-video.c Wed Feb 24 22:48:50 2010 -0300 +++ b/linux/drivers/media/video/tlg2300/pd-video.c Sun Feb 28 15:13:05 2010 +0100 @@ -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;