summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/host/nvhost_acm.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2012-01-02 11:14:26 +0200
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-01-24 10:50:35 -0800
commit3a74a9a1c0f6337f5c970de4d890f8f6841dc12f (patch)
treeaea0ca0cac1ec2760ec289fd6b85643db453b3ee /drivers/video/tegra/host/nvhost_acm.c
parent5665ef5e26fa8e3fd802153af908a39ea64c55c7 (diff)
video: tegra: host: Access nvhost_master via drvdata
Use standard drvdata interface for storing and accessing nvhost_master. Reviewed-on: http://git-master/r/72846 Change-Id: I191987c8f6d313a6ede9b59f723269cb6a197e8a Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/76815 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'drivers/video/tegra/host/nvhost_acm.c')
-rw-r--r--drivers/video/tegra/host/nvhost_acm.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c
index 7a0108ab5f2f..8d44d87769d1 100644
--- a/drivers/video/tegra/host/nvhost_acm.c
+++ b/drivers/video/tegra/host/nvhost_acm.c
@@ -441,15 +441,10 @@ static void debug_not_idle(struct nvhost_master *host)
int nvhost_module_suspend(struct nvhost_device *dev, bool system_suspend)
{
int ret;
- struct nvhost_master *host;
+ struct nvhost_master *host = nvhost_get_host(dev);
- if (system_suspend) {
- host = dev->host;
- if (!is_module_idle(dev))
- debug_not_idle(host);
- } else {
- host = dev->host;
- }
+ if (system_suspend && !is_module_idle(dev))
+ debug_not_idle(host);
ret = wait_event_timeout(dev->idle_wq, is_module_idle(dev),
ACM_SUSPEND_WAIT_FOR_IDLE_TIMEOUT);