From bab823973b0630e2f4515d5aabbe4fb46cdf3195 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 21 Jun 2017 15:56:05 -0700 Subject: gpu: nvgpu: Use accessor for finding struct device Use dev_from_gk20a() accessor whenever accessing struct device * from struct gk20a. JIRA NVGPU-38 Change-Id: Ide9fca3a56436c8f62e7872580a766c4c1e2353e Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master/r/1507930 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/vgpu/css_vgpu.c | 2 +- drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c | 4 ++-- drivers/gpu/nvgpu/vgpu/vgpu.c | 3 ++- drivers/gpu/nvgpu/vgpu/vgpu.h | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu') diff --git a/drivers/gpu/nvgpu/vgpu/css_vgpu.c b/drivers/gpu/nvgpu/vgpu/css_vgpu.c index d18ed100..a06ca037 100644 --- a/drivers/gpu/nvgpu/vgpu/css_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/css_vgpu.c @@ -29,7 +29,7 @@ static struct tegra_hv_ivm_cookie *css_cookie; static int vgpu_css_init_snapshot_buffer(struct gr_gk20a *gr) { struct gk20a *g = gr->g; - struct device *dev = g->dev; + struct device *dev = dev_from_gk20a(g); struct gk20a_cs_snapshot *data = gr->cs_data; struct device_node *np = dev->of_node; struct of_phandle_args args; diff --git a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c index af1631d8..7cab4d1e 100644 --- a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -35,7 +35,7 @@ struct vgpu_fecs_trace { static int vgpu_fecs_trace_init(struct gk20a *g) { - struct device *dev = g->dev; + struct device *dev = dev_from_gk20a(g); struct device_node *np = dev->of_node; struct of_phandle_args args; struct device_node *hv_np; diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index da77dc19..f02acad0 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c @@ -206,7 +206,8 @@ static int vgpu_intr_thread(void *dev_id) static void vgpu_remove_support(struct gk20a *g) { - struct vgpu_priv_data *priv = vgpu_get_priv_data_from_dev(g->dev); + struct vgpu_priv_data *priv = + vgpu_get_priv_data_from_dev(dev_from_gk20a(g)); struct tegra_vgpu_intr_msg msg; int err; diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.h b/drivers/gpu/nvgpu/vgpu/vgpu.h index 31ecb737..92b82ac4 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.h +++ b/drivers/gpu/nvgpu/vgpu/vgpu.h @@ -41,7 +41,7 @@ struct vgpu_priv_data *vgpu_get_priv_data_from_dev(struct device *dev) static inline struct vgpu_priv_data *vgpu_get_priv_data(struct gk20a *g) { - return vgpu_get_priv_data_from_dev(g->dev); + return vgpu_get_priv_data_from_dev(dev_from_gk20a(g)); } static inline u64 vgpu_get_handle_from_dev(struct device *dev) @@ -58,7 +58,7 @@ static inline u64 vgpu_get_handle_from_dev(struct device *dev) static inline u64 vgpu_get_handle(struct gk20a *g) { - return vgpu_get_handle_from_dev(g->dev); + return vgpu_get_handle_from_dev(dev_from_gk20a(g)); } int vgpu_pm_prepare_poweroff(struct device *dev); -- cgit v1.2.2