diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c index b2ae224f..87f0683f 100644 --- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | |||
@@ -144,7 +144,7 @@ static int gk20a_ctrl_alloc_as( | |||
144 | struct gk20a *g, | 144 | struct gk20a *g, |
145 | struct nvgpu_alloc_as_args *args) | 145 | struct nvgpu_alloc_as_args *args) |
146 | { | 146 | { |
147 | struct platform_device *dev = g->dev; | 147 | struct device *dev = g->dev; |
148 | struct gk20a_as_share *as_share; | 148 | struct gk20a_as_share *as_share; |
149 | int err; | 149 | int err; |
150 | int fd; | 150 | int fd; |
@@ -157,7 +157,7 @@ static int gk20a_ctrl_alloc_as( | |||
157 | fd = err; | 157 | fd = err; |
158 | 158 | ||
159 | name = kasprintf(GFP_KERNEL, "nvhost-%s-fd%d", | 159 | name = kasprintf(GFP_KERNEL, "nvhost-%s-fd%d", |
160 | dev_name(&dev->dev), fd); | 160 | dev_name(dev), fd); |
161 | 161 | ||
162 | file = anon_inode_getfile(name, g->as.cdev.ops, NULL, O_RDWR); | 162 | file = anon_inode_getfile(name, g->as.cdev.ops, NULL, O_RDWR); |
163 | kfree(name); | 163 | kfree(name); |
@@ -187,7 +187,7 @@ clean_up: | |||
187 | static int gk20a_ctrl_open_tsg(struct gk20a *g, | 187 | static int gk20a_ctrl_open_tsg(struct gk20a *g, |
188 | struct nvgpu_gpu_open_tsg_args *args) | 188 | struct nvgpu_gpu_open_tsg_args *args) |
189 | { | 189 | { |
190 | struct platform_device *dev = g->dev; | 190 | struct device *dev = g->dev; |
191 | int err; | 191 | int err; |
192 | int fd; | 192 | int fd; |
193 | struct file *file; | 193 | struct file *file; |
@@ -199,7 +199,7 @@ static int gk20a_ctrl_open_tsg(struct gk20a *g, | |||
199 | fd = err; | 199 | fd = err; |
200 | 200 | ||
201 | name = kasprintf(GFP_KERNEL, "nvgpu-%s-tsg%d", | 201 | name = kasprintf(GFP_KERNEL, "nvgpu-%s-tsg%d", |
202 | dev_name(&dev->dev), fd); | 202 | dev_name(dev), fd); |
203 | 203 | ||
204 | file = anon_inode_getfile(name, g->tsg.cdev.ops, NULL, O_RDWR); | 204 | file = anon_inode_getfile(name, g->tsg.cdev.ops, NULL, O_RDWR); |
205 | kfree(name); | 205 | kfree(name); |
@@ -621,7 +621,7 @@ static int nvgpu_gpu_get_cpu_time_correlation_info( | |||
621 | 621 | ||
622 | long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | 622 | long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) |
623 | { | 623 | { |
624 | struct platform_device *dev = filp->private_data; | 624 | struct device *dev = filp->private_data; |
625 | struct gk20a *g = get_gk20a(dev); | 625 | struct gk20a *g = get_gk20a(dev); |
626 | struct nvgpu_gpu_zcull_get_ctx_size_args *get_ctx_size_args; | 626 | struct nvgpu_gpu_zcull_get_ctx_size_args *get_ctx_size_args; |
627 | struct nvgpu_gpu_zcull_get_info_args *get_info_args; | 627 | struct nvgpu_gpu_zcull_get_info_args *get_info_args; |