]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
video: tegra: host: remove disable_clk() calls from clients
authorDeepak Nibade <dnibade@nvidia.com>
Tue, 24 Feb 2015 15:46:27 +0000 (21:16 +0530)
committerArto Merilainen <amerilainen@nvidia.com>
Thu, 26 Feb 2015 07:21:48 +0000 (23:21 -0800)
nvhost_module_disable_clk() is being called from some of
the clients in __exit path.
Remove this direct call from clients and call
nvhost_client_device_release() which will handle this
internally

Also, there is no need to export below APIs
nvhost_module_disable_clk()
nvhost_module_enable_clk()

Bug 1584065

Change-Id: I83c468d1eb7c4ba331fcca50c9eab19235297eeb
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/710785
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>
drivers/video/tegra/host/flcn/flcn.c
drivers/video/tegra/host/isp/isp.c
drivers/video/tegra/host/nvdec/nvdec.c
drivers/video/tegra/host/nvhost_acm.c
drivers/video/tegra/host/tsec/tsec.c

index 1e2c16b72b0491afc750ad9e0c5218cfe45716c4..d1ac5c99b7e98e6330e1946038f3e8cd2a6d77f3 100644 (file)
@@ -531,12 +531,7 @@ static int flcn_probe(struct platform_device *dev)
 
 static int __exit flcn_remove(struct platform_device *dev)
 {
-#ifdef CONFIG_PM_RUNTIME
-       pm_runtime_put(&dev->dev);
-       pm_runtime_disable(&dev->dev);
-#else
-       nvhost_module_disable_clk(&dev->dev);
-#endif
+       nvhost_client_device_release(dev);
        return 0;
 }
 
index 218c078d10715b6268be508729897cbc48abde2b..f299f5a1f5473568fd103b291ed38dae3a6a5aa4 100644 (file)
@@ -401,12 +401,6 @@ static int __exit isp_remove(struct platform_device *dev)
 #if defined(CONFIG_TEGRA_ISOMGR)
        if (tegra_isp->isomgr_handle)
                isp_isomgr_unregister(tegra_isp);
-#endif
-#ifdef CONFIG_PM_RUNTIME
-       pm_runtime_put(&dev->dev);
-       pm_runtime_disable(&dev->dev);
-#else
-       nvhost_module_disable_clk(&dev->dev);
 #endif
        nvhost_client_device_release(dev);
        disable_irq(tegra_isp->irq);
index ea012144b95d5028ea3058086afa909fcb89b2c8..c2399aba269bb8767451fd7444db7c44df362933 100644 (file)
@@ -752,12 +752,7 @@ static int nvdec_probe(struct platform_device *dev)
 
 static int __exit nvdec_remove(struct platform_device *dev)
 {
-#ifdef CONFIG_PM_RUNTIME
-       pm_runtime_put(&dev->dev);
-       pm_runtime_disable(&dev->dev);
-#else
-       nvhost_module_disable_clk(&dev->dev);
-#endif
+       nvhost_client_device_release(dev);
        return 0;
 }
 
index b50499613b35917289776ac23d48e672ed75fcea..4c590e9894c46ca12017bced13c6bac26d485648 100644 (file)
@@ -953,7 +953,6 @@ int nvhost_module_enable_clk(struct device *dev)
 
        return 0;
 }
-EXPORT_SYMBOL(nvhost_module_enable_clk);
 
 int nvhost_module_disable_clk(struct device *dev)
 {
@@ -976,7 +975,6 @@ int nvhost_module_disable_clk(struct device *dev)
 
        return 0;
 }
-EXPORT_SYMBOL(nvhost_module_disable_clk);
 
 static void nvhost_module_load_regs(struct platform_device *pdev, bool prod)
 {
index 8cbe1ddff55b9039203c7d4cdcc7b703fda1f6f7..d785268f9ac0ee4a29a4193dfa90ba5a0e5e21e9 100644 (file)
@@ -973,13 +973,7 @@ static int tsec_probe(struct platform_device *dev)
 
 static int __exit tsec_remove(struct platform_device *dev)
 {
-#ifdef CONFIG_PM_RUNTIME
-       pm_runtime_put(&dev->dev);
-       pm_runtime_disable(&dev->dev);
-#else
-       nvhost_module_disable_clk(&dev->dev);
-#endif
-
+       nvhost_client_device_release(dev);
        return 0;
 }