From 3e39798997f0726472e18a17462216094c084074 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 24 Mar 2017 10:55:46 -0700 Subject: gpu: nvgpu: Remove unnecessary use of dev_name() Move the name field from struct gpu_ops up to struct gk20a. The field is not a function op, so it doesn't belong in gpu_ops. Replace all uses of dev_name() with use of g->name when possible. JIRA NVGPU-16 Change-Id: Ic6e99e39258cbf3bb7c806962cbbd7de5126688f Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1328534 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/as_gk20a.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/as_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/as_gk20a.c b/drivers/gpu/nvgpu/gk20a/as_gk20a.c index 01c05d00..7dcb8ed7 100644 --- a/drivers/gpu/nvgpu/gk20a/as_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/as_gk20a.c @@ -381,7 +381,7 @@ long gk20a_as_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) switch (cmd) { case NVGPU_AS_IOCTL_BIND_CHANNEL: - trace_gk20a_as_ioctl_bind_channel(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_bind_channel(g->name); err = gk20a_as_ioctl_bind_channel(as_share, (struct nvgpu_as_bind_channel_args *)buf); @@ -396,38 +396,38 @@ long gk20a_as_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) args.page_size = args32->page_size; args.flags = args32->flags; args.o_a.offset = args32->o_a.offset; - trace_gk20a_as_ioctl_alloc_space(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_alloc_space(g->name); err = gk20a_as_ioctl_alloc_space(as_share, &args); args32->o_a.offset = args.o_a.offset; break; } case NVGPU_AS_IOCTL_ALLOC_SPACE: - trace_gk20a_as_ioctl_alloc_space(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_alloc_space(g->name); err = gk20a_as_ioctl_alloc_space(as_share, (struct nvgpu_as_alloc_space_args *)buf); break; case NVGPU_AS_IOCTL_FREE_SPACE: - trace_gk20a_as_ioctl_free_space(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_free_space(g->name); err = gk20a_as_ioctl_free_space(as_share, (struct nvgpu_as_free_space_args *)buf); break; case NVGPU_AS_IOCTL_MAP_BUFFER: - trace_gk20a_as_ioctl_map_buffer(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_map_buffer(g->name); err = gk20a_as_ioctl_map_buffer(as_share, (struct nvgpu_as_map_buffer_args *)buf); break; case NVGPU_AS_IOCTL_MAP_BUFFER_EX: - trace_gk20a_as_ioctl_map_buffer(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_map_buffer(g->name); err = gk20a_as_ioctl_map_buffer_ex(as_share, (struct nvgpu_as_map_buffer_ex_args *)buf); break; case NVGPU_AS_IOCTL_UNMAP_BUFFER: - trace_gk20a_as_ioctl_unmap_buffer(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_unmap_buffer(g->name); err = gk20a_as_ioctl_unmap_buffer(as_share, (struct nvgpu_as_unmap_buffer_args *)buf); break; case NVGPU_AS_IOCTL_GET_VA_REGIONS: - trace_gk20a_as_ioctl_get_va_regions(dev_name(dev_from_gk20a(g))); + trace_gk20a_as_ioctl_get_va_regions(g->name); err = gk20a_as_ioctl_get_va_regions(as_share, (struct nvgpu_as_get_va_regions_args *)buf); break; -- cgit v1.2.2