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/sim_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/sim_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/sim_gk20a.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/sim_gk20a.c b/drivers/gpu/nvgpu/gk20a/sim_gk20a.c index 122e66f9..ecf829b7 100644 --- a/drivers/gpu/nvgpu/gk20a/sim_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/sim_gk20a.c | |||
@@ -78,14 +78,14 @@ static int alloc_and_kmap_iopage(struct gk20a *g, | |||
78 | 78 | ||
79 | if (!*page) { | 79 | if (!*page) { |
80 | err = -ENOMEM; | 80 | err = -ENOMEM; |
81 | nvgpu_err(g, "couldn't allocate io page\n"); | 81 | nvgpu_err(g, "couldn't allocate io page"); |
82 | goto fail; | 82 | goto fail; |
83 | } | 83 | } |
84 | 84 | ||
85 | *kvaddr = kmap(*page); | 85 | *kvaddr = kmap(*page); |
86 | if (!*kvaddr) { | 86 | if (!*kvaddr) { |
87 | err = -ENOMEM; | 87 | err = -ENOMEM; |
88 | nvgpu_err(g, "couldn't kmap io page\n"); | 88 | nvgpu_err(g, "couldn't kmap io page"); |
89 | goto fail; | 89 | goto fail; |
90 | } | 90 | } |
91 | *phys = page_to_phys(*page); | 91 | *phys = page_to_phys(*page); |
@@ -119,7 +119,7 @@ int gk20a_init_sim_support(struct platform_device *pdev) | |||
119 | 119 | ||
120 | if (!(g->sim.send_bfr.kvaddr && g->sim.recv_bfr.kvaddr && | 120 | if (!(g->sim.send_bfr.kvaddr && g->sim.recv_bfr.kvaddr && |
121 | g->sim.msg_bfr.kvaddr)) { | 121 | g->sim.msg_bfr.kvaddr)) { |
122 | nvgpu_err(g, "couldn't allocate all sim buffers\n"); | 122 | nvgpu_err(g, "couldn't allocate all sim buffers"); |
123 | goto fail; | 123 | goto fail; |
124 | } | 124 | } |
125 | 125 | ||
@@ -269,7 +269,7 @@ static int rpc_recv_poll(struct gk20a *g) | |||
269 | (u64)recv_phys_addr_lo << PAGE_SHIFT; | 269 | (u64)recv_phys_addr_lo << PAGE_SHIFT; |
270 | 270 | ||
271 | if (recv_phys_addr != g->sim.msg_bfr.phys) { | 271 | if (recv_phys_addr != g->sim.msg_bfr.phys) { |
272 | nvgpu_err(g, "%s Error in RPC reply\n", | 272 | nvgpu_err(g, "%s Error in RPC reply", |
273 | __func__); | 273 | __func__); |
274 | return -1; | 274 | return -1; |
275 | } | 275 | } |
@@ -296,21 +296,21 @@ static int issue_rpc_and_wait(struct gk20a *g) | |||
296 | 296 | ||
297 | err = rpc_send_message(g); | 297 | err = rpc_send_message(g); |
298 | if (err) { | 298 | if (err) { |
299 | nvgpu_err(g, "%s failed rpc_send_message\n", | 299 | nvgpu_err(g, "%s failed rpc_send_message", |
300 | __func__); | 300 | __func__); |
301 | return err; | 301 | return err; |
302 | } | 302 | } |
303 | 303 | ||
304 | err = rpc_recv_poll(g); | 304 | err = rpc_recv_poll(g); |
305 | if (err) { | 305 | if (err) { |
306 | nvgpu_err(g, "%s failed rpc_recv_poll\n", | 306 | nvgpu_err(g, "%s failed rpc_recv_poll", |
307 | __func__); | 307 | __func__); |
308 | return err; | 308 | return err; |
309 | } | 309 | } |
310 | 310 | ||
311 | /* Now check if RPC really succeeded */ | 311 | /* Now check if RPC really succeeded */ |
312 | if (*sim_msg_hdr(g, sim_msg_result_r()) != sim_msg_result_success_v()) { | 312 | if (*sim_msg_hdr(g, sim_msg_result_r()) != sim_msg_result_success_v()) { |
313 | nvgpu_err(g, "%s received failed status!\n", | 313 | nvgpu_err(g, "%s received failed status!", |
314 | __func__); | 314 | __func__); |
315 | return -(*sim_msg_hdr(g, sim_msg_result_r())); | 315 | return -(*sim_msg_hdr(g, sim_msg_result_r())); |
316 | } | 316 | } |