From 713882860f85b874b350ae841e438942f6375eba Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 15 Jun 2012 14:48:47 +0300 Subject: video: tegra: host: Exclude suspend/resume if disabled Compile power management suspend and resume functions only when CONFIG_PM is enabled. Change-Id: If349984d62ed002594ba60ac25cd4dddd956aa6c Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/109425 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Mayuresh Kulkarni Reviewed-by: Bharat Nihalani --- drivers/video/tegra/host/gr2d/gr2d.c | 2 ++ drivers/video/tegra/host/gr3d/gr3d.c | 2 ++ drivers/video/tegra/host/isp/isp.c | 2 ++ drivers/video/tegra/host/mpe/mpe.c | 2 ++ drivers/video/tegra/host/vi/vi.c | 2 ++ 5 files changed, 10 insertions(+) (limited to 'drivers/video/tegra') diff --git a/drivers/video/tegra/host/gr2d/gr2d.c b/drivers/video/tegra/host/gr2d/gr2d.c index 1bbfcdd8b587..56752eba5951 100644 --- a/drivers/video/tegra/host/gr2d/gr2d.c +++ b/drivers/video/tegra/host/gr2d/gr2d.c @@ -33,6 +33,7 @@ static int __exit gr2d_remove(struct nvhost_device *dev) return 0; } +#ifdef CONFIG_PM static int gr2d_suspend(struct nvhost_device *dev, pm_message_t state) { return nvhost_client_device_suspend(dev); @@ -43,6 +44,7 @@ static int gr2d_resume(struct nvhost_device *dev) dev_info(&dev->dev, "resuming\n"); return 0; } +#endif static struct nvhost_driver gr2d_driver = { .probe = gr2d_probe, diff --git a/drivers/video/tegra/host/gr3d/gr3d.c b/drivers/video/tegra/host/gr3d/gr3d.c index e2af384fb09a..bf8309b22740 100644 --- a/drivers/video/tegra/host/gr3d/gr3d.c +++ b/drivers/video/tegra/host/gr3d/gr3d.c @@ -223,6 +223,7 @@ static int __exit gr3d_remove(struct nvhost_device *dev) return 0; } +#ifdef CONFIG_PM static int gr3d_suspend(struct nvhost_device *dev, pm_message_t state) { return nvhost_client_device_suspend(dev); @@ -233,6 +234,7 @@ static int gr3d_resume(struct nvhost_device *dev) dev_info(&dev->dev, "resuming\n"); return 0; } +#endif static struct nvhost_driver gr3d_driver = { .probe = gr3d_probe, diff --git a/drivers/video/tegra/host/isp/isp.c b/drivers/video/tegra/host/isp/isp.c index 0a581f89e78d..33f9cf947820 100644 --- a/drivers/video/tegra/host/isp/isp.c +++ b/drivers/video/tegra/host/isp/isp.c @@ -33,6 +33,7 @@ static int __devinit isp_probe(struct nvhost_device *dev, return nvhost_client_device_init(dev); } +#ifdef CONFIG_PM static int __exit isp_remove(struct nvhost_device *dev) { /* Add clean-up */ @@ -43,6 +44,7 @@ static int isp_suspend(struct nvhost_device *dev, pm_message_t state) { return nvhost_client_device_suspend(dev); } +#endif static int isp_resume(struct nvhost_device *dev) { diff --git a/drivers/video/tegra/host/mpe/mpe.c b/drivers/video/tegra/host/mpe/mpe.c index e47c1029a3c5..c738700469c6 100644 --- a/drivers/video/tegra/host/mpe/mpe.c +++ b/drivers/video/tegra/host/mpe/mpe.c @@ -639,6 +639,7 @@ static int __exit mpe_remove(struct nvhost_device *dev) return 0; } +#ifdef CONFIG_PM static int mpe_suspend(struct nvhost_device *dev, pm_message_t state) { return nvhost_client_device_suspend(dev); @@ -649,6 +650,7 @@ static int mpe_resume(struct nvhost_device *dev) dev_info(&dev->dev, "resuming\n"); return 0; } +#endif static struct nvhost_driver mpe_driver = { .probe = mpe_probe, diff --git a/drivers/video/tegra/host/vi/vi.c b/drivers/video/tegra/host/vi/vi.c index 3985ee029efa..ee801c91efa5 100644 --- a/drivers/video/tegra/host/vi/vi.c +++ b/drivers/video/tegra/host/vi/vi.c @@ -39,6 +39,7 @@ static int __exit vi_remove(struct nvhost_device *dev) return 0; } +#ifdef CONFIG_PM static int vi_suspend(struct nvhost_device *dev, pm_message_t state) { return nvhost_client_device_suspend(dev); @@ -49,6 +50,7 @@ static int vi_resume(struct nvhost_device *dev) dev_info(&dev->dev, "resuming\n"); return 0; } +#endif static struct nvhost_driver vi_driver = { .probe = vi_probe, -- cgit v1.2.3