From 236573e00a285ec2c94479ffe68c168b4d1464e6 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Wed, 4 Oct 2017 07:06:52 -0700 Subject: gpu: nvgpu: clean up channel open/release declares Below APIs are already declared in ioctl_channel.h, and hence remove duplicate declaration from channel_gk20a.h gk20a_channel_open() gk20a_channel_ioctl() gk20a_channel_release() And move declaration of gk20a_channel_open_ioctl() from channel_gk20a.h to ioctl_channel.h Jira NVGPU-259 Change-Id: I46702ca481e41a19f92f4fe0169f95e31360abe0 Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/1573106 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/ioctl_channel.h | 2 ++ drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 1 + drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 8 -------- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_channel.h b/drivers/gpu/nvgpu/common/linux/ioctl_channel.h index f488ceca..1aac04aa 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_channel.h +++ b/drivers/gpu/nvgpu/common/linux/ioctl_channel.h @@ -17,6 +17,8 @@ int gk20a_channel_open(struct inode *inode, struct file *filp); int gk20a_channel_release(struct inode *inode, struct file *filp); long gk20a_channel_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); +int gk20a_channel_open_ioctl(struct gk20a *g, + struct nvgpu_channel_open_args *args); extern const struct file_operations gk20a_event_id_ops; extern const struct file_operations gk20a_channel_ops; diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index 87ae0a3d..c8460bd9 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c @@ -29,6 +29,7 @@ #include "ioctl_ctrl.h" #include "ioctl_tsg.h" +#include "ioctl_channel.h" #include "gk20a/gk20a.h" #include "gk20a/platform_gk20a.h" #include "gk20a/fence_gk20a.h" diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index eb777f09..e4cce101 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h @@ -348,14 +348,6 @@ void gk20a_channel_deterministic_unidle(struct gk20a *g); int nvgpu_channel_worker_init(struct gk20a *g); void nvgpu_channel_worker_deinit(struct gk20a *g); -/* Channel file operations */ -int gk20a_channel_open(struct inode *inode, struct file *filp); -int gk20a_channel_open_ioctl(struct gk20a *g, - struct nvgpu_channel_open_args *args); -long gk20a_channel_ioctl(struct file *filp, - unsigned int cmd, - unsigned long arg); -int gk20a_channel_release(struct inode *inode, struct file *filp); struct channel_gk20a *gk20a_get_channel_from_file(int fd); void gk20a_channel_update(struct channel_gk20a *c); -- cgit v1.2.2