From 2e338c77eac4edffb94c8c9480dbd72712c7696f Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Mon, 22 May 2017 12:27:40 -0600 Subject: gpu: nvgpu: remove duplicate \n from log messages nvgpu_log/info/warn/err() internally add a \n to the end of the message. Hence, callers should not include a \n at the end of the message. Doing so results in duplicate \n being printed, which ends up creating empty log messages. Remove the duplicate \n from all err/warn messages. Bug 1928311 Change-Id: I99362c5327f36146f28ba63d4e68181589735c39 Signed-off-by: Stephen Warren Reviewed-on: http://git-master/r/1487232 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/ioctl_channel.c | 4 ++-- drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 8 ++++---- drivers/gpu/nvgpu/common/linux/kmem.c | 2 +- drivers/gpu/nvgpu/common/linux/vm.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c index c7adb76c..2502ff30 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.c @@ -203,7 +203,7 @@ static int gk20a_init_error_notifier(struct channel_gk20a *ch, if (end > dmabuf->size || end < sizeof(struct nvgpu_notification)) { dma_buf_put(dmabuf); - nvgpu_err(ch->g, "gk20a_init_error_notifier: invalid offset\n"); + nvgpu_err(ch->g, "gk20a_init_error_notifier: invalid offset"); return -EINVAL; } @@ -462,7 +462,7 @@ static int gk20a_channel_wait(struct channel_gk20a *ch, if (end > dmabuf->size || end < sizeof(struct notification)) { dma_buf_put(dmabuf); - nvgpu_err(g, "invalid notifier offset\n"); + nvgpu_err(g, "invalid notifier offset"); return -EINVAL; } diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index 8d95dd35..0f3d762d 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c @@ -357,7 +357,7 @@ static int nvgpu_gpu_ioctl_set_mmu_debug_mode( struct nvgpu_gpu_mmu_debug_mode_args *args) { if (gk20a_busy(g)) { - nvgpu_err(g, "failed to power on gpu\n"); + nvgpu_err(g, "failed to power on gpu"); return -EINVAL; } @@ -559,7 +559,7 @@ static inline int get_timestamps_zipper(struct gk20a *g, unsigned int i = 0; if (gk20a_busy(g)) { - nvgpu_err(g, "GPU not powered on\n"); + nvgpu_err(g, "GPU not powered on"); err = -EINVAL; goto end; } @@ -598,7 +598,7 @@ static int nvgpu_gpu_get_cpu_time_correlation_info( get_cpu_timestamp = get_cpu_timestamp_timeofday; break; default: - nvgpu_err(g, "invalid cpu clock source id\n"); + nvgpu_err(g, "invalid cpu clock source id"); return -EINVAL; } @@ -663,7 +663,7 @@ static int nvgpu_gpu_get_engine_info( break; default: - nvgpu_err(g, "Unmapped engine enum %u\n", + nvgpu_err(g, "Unmapped engine enum %u", engine_enum); continue; } diff --git a/drivers/gpu/nvgpu/common/linux/kmem.c b/drivers/gpu/nvgpu/common/linux/kmem.c index 0d185e56..8422d761 100644 --- a/drivers/gpu/nvgpu/common/linux/kmem.c +++ b/drivers/gpu/nvgpu/common/linux/kmem.c @@ -819,7 +819,7 @@ void nvgpu_kmem_fini(struct gk20a *g, int flags) if (flags & NVGPU_KMEM_FINI_WARN) { WARN(1, "Letting %d allocs leak!!\n", count); } else if (flags & NVGPU_KMEM_FINI_BUG) { - nvgpu_err(g, "Letting %d allocs leak!!\n", count); + nvgpu_err(g, "Letting %d allocs leak!!", count); BUG(); } } diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/common/linux/vm.c index 9238a9df..c2d80e2d 100644 --- a/drivers/gpu/nvgpu/common/linux/vm.c +++ b/drivers/gpu/nvgpu/common/linux/vm.c @@ -399,7 +399,7 @@ clean_up: gk20a_mm_unpin(g->dev, dmabuf, bfr.sgt); nvgpu_mutex_release(&vm->update_gmmu_lock); - nvgpu_log_info(g, "err=%d\n", err); + nvgpu_log_info(g, "err=%d", err); return 0; } -- cgit v1.2.2