From 0e39ad429e8aa68cd11e464cd76a8b9d1912fb7d Mon Sep 17 00:00:00 2001 From: Richard Zhao Date: Mon, 29 Jan 2018 16:15:58 -0800 Subject: gpu: nvgpu: vgpu: move to nvgpu_err/info from dev_err/info It helps code be more portable. Jira EVLR-2364 Change-Id: I0cc1fa739d7884d3c863975f08b3b592acd34613 Signed-off-by: Richard Zhao Reviewed-on: https://git-master.nvidia.com/r/1649941 Reviewed-by: Aingara Paramakuru Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit Reviewed-by: Nirav Patel Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h') diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h index e9a73baf..be999930 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h +++ b/drivers/gpu/nvgpu/common/linux/vgpu/vgpu.h @@ -53,23 +53,18 @@ static inline struct vgpu_priv_data *vgpu_get_priv_data(struct gk20a *g) return vgpu_get_priv_data_from_dev(dev_from_gk20a(g)); } -static inline u64 vgpu_get_handle_from_dev(struct device *dev) +static inline u64 vgpu_get_handle(struct gk20a *g) { - struct vgpu_priv_data *priv = vgpu_get_priv_data_from_dev(dev); + struct vgpu_priv_data *priv = vgpu_get_priv_data(g); if (unlikely(!priv)) { - dev_err(dev, "invalid vgpu_priv_data in %s\n", __func__); + nvgpu_err(g, "invalid vgpu_priv_data in %s", __func__); return INT_MAX; } return priv->virt_handle; } -static inline u64 vgpu_get_handle(struct gk20a *g) -{ - return vgpu_get_handle_from_dev(dev_from_gk20a(g)); -} - int vgpu_pm_prepare_poweroff(struct device *dev); int vgpu_pm_finalize_poweron(struct device *dev); int vgpu_probe(struct platform_device *dev); -- cgit v1.2.2