From dd739fcb039d51606e9a5454ec0aab17bcb01965 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 18 Apr 2018 19:39:46 -0700 Subject: gpu: nvgpu: Remove gk20a_dbg* functions Switch all logging to nvgpu_log*(). gk20a_dbg* macros are intentionally left there because of use from other repositories. Because the new functions do not work without a pointer to struct gk20a, and piping it just for logging is excessive, some log messages are deleted. Change-Id: I00e22e75fe4596a330bb0282ab4774b3639ee31e Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1704148 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/debug_fifo.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/common/linux/debug_fifo.c') diff --git a/drivers/gpu/nvgpu/common/linux/debug_fifo.c b/drivers/gpu/nvgpu/common/linux/debug_fifo.c index aeab0c92..b2a87e0d 100644 --- a/drivers/gpu/nvgpu/common/linux/debug_fifo.c +++ b/drivers/gpu/nvgpu/common/linux/debug_fifo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 NVIDIA Corporation. All rights reserved. + * Copyright (C) 2017-2018 NVIDIA Corporation. All rights reserved. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -108,6 +108,7 @@ static const struct seq_operations gk20a_fifo_sched_debugfs_seq_ops = { static int gk20a_fifo_sched_debugfs_open(struct inode *inode, struct file *file) { + struct gk20a *g = inode->i_private; int err; if (!capable(CAP_SYS_ADMIN)) @@ -117,7 +118,7 @@ static int gk20a_fifo_sched_debugfs_open(struct inode *inode, if (err) return err; - gk20a_dbg(gpu_dbg_info, "i_private=%p", inode->i_private); + nvgpu_log(g, gpu_dbg_info, "i_private=%p", inode->i_private); ((struct seq_file *)file->private_data)->private = inode->i_private; return 0; @@ -301,7 +302,7 @@ void gk20a_fifo_debugfs_init(struct gk20a *g) if (IS_ERR_OR_NULL(fifo_root)) return; - gk20a_dbg(gpu_dbg_info, "g=%p", g); + nvgpu_log(g, gpu_dbg_info, "g=%p", g); debugfs_create_file("sched", 0600, fifo_root, g, &gk20a_fifo_sched_debugfs_fops); -- cgit v1.2.2