video: tegra: host: Fix pdev use in actmon deinit

Use engine platform device specific pointers instead host1x.

Bug 1515087

Change-Id: I5164dfbe01126f4b24aa1b126b4a409518d004b4
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/556732
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

diff --git a/drivers/video/tegra/host/host1x/host1x_actmon_t124.c b/drivers/video/tegra/host/host1x/host1x_actmon_t124.c
index 3d0dcbe54ab43b7c3108fb61547e160d8a7bbcb0..5ebb5db319c3978258a67e8ad370bb087143c37f 100644 (file)
--- a/drivers/video/tegra/host/host1x/host1x_actmon_t124.c
+++ b/drivers/video/tegra/host/host1x/host1x_actmon_t124.c
@@ -181,8 +181,9 @@ static int host1x_actmon_init(struct host1x_actmon *actmon)
 
 static void host1x_actmon_deinit(struct host1x_actmon *actmon)
 {
-       struct platform_device *pdev = actmon->host->dev;
-       struct nvhost_device_data *pdata = platform_get_drvdata(pdev);
+       struct platform_device *host_pdev = actmon->host->dev;
+       struct nvhost_device_data *engine_pdata =
+               platform_get_drvdata(actmon->pdev);
 
        if (actmon->init != ACTMON_READY)
                return;
@@ -191,8 +192,8 @@ static void host1x_actmon_deinit(struct host1x_actmon *actmon)
 
        actmon_writel(actmon, 0, actmon_ctrl_r());
        actmon_writel(actmon, 0xffffffff, actmon_intr_status_r());
-       nvhost_intr_disable_host_irq(&nvhost_get_host(pdev)->intr,
-                                    pdata->actmon_irq);
+       nvhost_intr_disable_host_irq(&nvhost_get_host(host_pdev)->intr,
+                                    engine_pdata->actmon_irq);
 }
 
 static int host1x_actmon_avg(struct host1x_actmon *actmon, u32 *val)