diff options
author | Stephen Warren <swarren@nvidia.com> | 2017-05-22 14:27:40 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-05-26 06:34:30 -0400 |
commit | 2e338c77eac4edffb94c8c9480dbd72712c7696f (patch) | |
tree | 9d5da6355bc653ef2ba9014ea696ad0391c523a1 /drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |
parent | 726900b8433294fd89a6d730d2fec9de8e33afda (diff) |
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 <swarren@nvidia.com>
Reviewed-on: http://git-master/r/1487232
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index 1f9b856d..09268b6b 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |||
@@ -241,7 +241,7 @@ static int gk20a_dbg_gpu_events_ctrl(struct dbg_session_gk20a *dbg_s, | |||
241 | ch = nvgpu_dbg_gpu_get_session_channel(dbg_s); | 241 | ch = nvgpu_dbg_gpu_get_session_channel(dbg_s); |
242 | if (!ch) { | 242 | if (!ch) { |
243 | nvgpu_err(dbg_s->g, | 243 | nvgpu_err(dbg_s->g, |
244 | "no channel bound to dbg session\n"); | 244 | "no channel bound to dbg session"); |
245 | return -EINVAL; | 245 | return -EINVAL; |
246 | } | 246 | } |
247 | 247 | ||
@@ -759,7 +759,7 @@ static int nvgpu_dbg_gpu_ioctl_read_single_sm_error_state( | |||
759 | write_size); | 759 | write_size); |
760 | nvgpu_mutex_release(&g->dbg_sessions_lock); | 760 | nvgpu_mutex_release(&g->dbg_sessions_lock); |
761 | if (err) { | 761 | if (err) { |
762 | nvgpu_err(g, "copy_to_user failed!\n"); | 762 | nvgpu_err(g, "copy_to_user failed!"); |
763 | return err; | 763 | return err; |
764 | } | 764 | } |
765 | 765 | ||
@@ -1197,7 +1197,7 @@ static int nvgpu_ioctl_channel_reg_ops(struct dbg_session_gk20a *dbg_s, | |||
1197 | /* be sure that ctx info is in place */ | 1197 | /* be sure that ctx info is in place */ |
1198 | if (!g->is_virtual && | 1198 | if (!g->is_virtual && |
1199 | !gr_context_info_available(dbg_s, &g->gr)) { | 1199 | !gr_context_info_available(dbg_s, &g->gr)) { |
1200 | nvgpu_err(g, "gr context data not available\n"); | 1200 | nvgpu_err(g, "gr context data not available"); |
1201 | return -ENODEV; | 1201 | return -ENODEV; |
1202 | } | 1202 | } |
1203 | 1203 | ||
@@ -1414,7 +1414,7 @@ static int nvgpu_dbg_gpu_ioctl_smpc_ctxsw_mode(struct dbg_session_gk20a *dbg_s, | |||
1414 | ch_gk20a = nvgpu_dbg_gpu_get_session_channel(dbg_s); | 1414 | ch_gk20a = nvgpu_dbg_gpu_get_session_channel(dbg_s); |
1415 | if (!ch_gk20a) { | 1415 | if (!ch_gk20a) { |
1416 | nvgpu_err(g, | 1416 | nvgpu_err(g, |
1417 | "no bound channel for smpc ctxsw mode update\n"); | 1417 | "no bound channel for smpc ctxsw mode update"); |
1418 | err = -EINVAL; | 1418 | err = -EINVAL; |
1419 | goto clean_up; | 1419 | goto clean_up; |
1420 | } | 1420 | } |
@@ -1423,7 +1423,7 @@ static int nvgpu_dbg_gpu_ioctl_smpc_ctxsw_mode(struct dbg_session_gk20a *dbg_s, | |||
1423 | args->mode == NVGPU_DBG_GPU_SMPC_CTXSW_MODE_CTXSW); | 1423 | args->mode == NVGPU_DBG_GPU_SMPC_CTXSW_MODE_CTXSW); |
1424 | if (err) { | 1424 | if (err) { |
1425 | nvgpu_err(g, | 1425 | nvgpu_err(g, |
1426 | "error (%d) during smpc ctxsw mode update\n", err); | 1426 | "error (%d) during smpc ctxsw mode update", err); |
1427 | goto clean_up; | 1427 | goto clean_up; |
1428 | } | 1428 | } |
1429 | 1429 | ||
@@ -1466,7 +1466,7 @@ static int nvgpu_dbg_gpu_ioctl_hwpm_ctxsw_mode(struct dbg_session_gk20a *dbg_s, | |||
1466 | ch_gk20a = nvgpu_dbg_gpu_get_session_channel(dbg_s); | 1466 | ch_gk20a = nvgpu_dbg_gpu_get_session_channel(dbg_s); |
1467 | if (!ch_gk20a) { | 1467 | if (!ch_gk20a) { |
1468 | nvgpu_err(g, | 1468 | nvgpu_err(g, |
1469 | "no bound channel for pm ctxsw mode update\n"); | 1469 | "no bound channel for pm ctxsw mode update"); |
1470 | err = -EINVAL; | 1470 | err = -EINVAL; |
1471 | goto clean_up; | 1471 | goto clean_up; |
1472 | } | 1472 | } |
@@ -1475,7 +1475,7 @@ static int nvgpu_dbg_gpu_ioctl_hwpm_ctxsw_mode(struct dbg_session_gk20a *dbg_s, | |||
1475 | args->mode == NVGPU_DBG_GPU_HWPM_CTXSW_MODE_CTXSW); | 1475 | args->mode == NVGPU_DBG_GPU_HWPM_CTXSW_MODE_CTXSW); |
1476 | if (err) | 1476 | if (err) |
1477 | nvgpu_err(g, | 1477 | nvgpu_err(g, |
1478 | "error (%d) during pm ctxsw mode update\n", err); | 1478 | "error (%d) during pm ctxsw mode update", err); |
1479 | 1479 | ||
1480 | /* gk20a would require a WAR to set the core PM_ENABLE bit, not | 1480 | /* gk20a would require a WAR to set the core PM_ENABLE bit, not |
1481 | * added here with gk20a being deprecated | 1481 | * added here with gk20a being deprecated |
@@ -1528,7 +1528,7 @@ static int nvgpu_dbg_gpu_ioctl_suspend_resume_sm( | |||
1528 | 1528 | ||
1529 | err = gr_gk20a_enable_ctxsw(g); | 1529 | err = gr_gk20a_enable_ctxsw(g); |
1530 | if (err) | 1530 | if (err) |
1531 | nvgpu_err(g, "unable to restart ctxsw!\n"); | 1531 | nvgpu_err(g, "unable to restart ctxsw!"); |
1532 | 1532 | ||
1533 | clean_up: | 1533 | clean_up: |
1534 | nvgpu_mutex_release(&g->dbg_sessions_lock); | 1534 | nvgpu_mutex_release(&g->dbg_sessions_lock); |