SYSLINK: Use unlocked_ioctl instead of ioctl

This patch uses unlocked_ioctl instead of ioctl in all SysLink drivers.
The support for ioctl was removed since BKL is not to be used anymore.

Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>

4 files changed, 11 insertions, 13 deletions

diff --git a/drivers/dsp/syslink/devh/devh.c b/drivers/dsp/syslink/devh/devh.c
index 0e3cabe665f..609bb312be2 100644
--- a/drivers/dsp/syslink/devh/devh.c
+++ b/drivers/dsp/syslink/devh/devh.c
@@ -65,8 +65,8 @@ static int omap_devh_release(struct inode *inode, struct file *filp)
 	return 0;
 }
 
-static int omap_devh_ioctl(struct inode *inode, struct file *filp,
-					unsigned int cmd, unsigned long arg)
+static long omap_devh_ioctl(struct file *filp, unsigned int cmd,
+						unsigned long arg)
 {
 	int rc = 0;
 	struct omap_devh *devh = filp->private_data;
@@ -117,7 +117,7 @@ static int omap_devh_ioctl(struct inode *inode, struct file *filp,
 static const struct file_operations omap_devh_fops = {
 	.open		=	omap_devh_open,
 	.release	=	omap_devh_release,
-	.ioctl		=	omap_devh_ioctl,
+	.unlocked_ioctl	=	omap_devh_ioctl,
 	.owner		=	THIS_MODULE,
 };
 
diff --git a/drivers/dsp/syslink/multicore_ipc/ipc_drv.c b/drivers/dsp/syslink/multicore_ipc/ipc_drv.c
index f7b0e8c687c..d3c5a1b279e 100644
--- a/drivers/dsp/syslink/multicore_ipc/ipc_drv.c
+++ b/drivers/dsp/syslink/multicore_ipc/ipc_drv.c
@@ -239,7 +239,7 @@ err:
  *  This function  provides IO interface  to the
  *  ipc driver
  */
-static int ipc_ioctl(struct inode *ip, struct file *filp, u32 cmd, ulong arg)
+static long ipc_ioctl(struct file *filp, u32 cmd, ulong arg)
 {
 	s32 retval = 0;
 	void __user *argp = (void __user *)arg;
@@ -267,7 +267,7 @@ exit:
 static const struct file_operations ipc_fops = {
 	.open = ipc_open,
 	.release = ipc_release,
-	.ioctl = ipc_ioctl,
+	.unlocked_ioctl = ipc_ioctl,
 	.read = notify_drv_read,
 	.mmap = notify_drv_mmap,
 };
diff --git a/drivers/dsp/syslink/procmgr/proc4430/proc4430_drv.c b/drivers/dsp/syslink/procmgr/proc4430/proc4430_drv.c
index 5564c3f05b2..9a334b372a3 100644
--- a/drivers/dsp/syslink/procmgr/proc4430/proc4430_drv.c
+++ b/drivers/dsp/syslink/procmgr/proc4430/proc4430_drv.c
@@ -66,8 +66,7 @@ static int proc4430_drv_open(struct inode *inode, struct file *filp);
 static int proc4430_drv_release(struct inode *inode, struct file *filp);
 
 /* Linux driver function to invoke the APIs through ioctl. */
-static int proc4430_drv_ioctl(struct inode *inode,
-			struct file *filp, unsigned int cmd,
+static long proc4430_drv_ioctl(struct file *filp, unsigned int cmd,
 			unsigned long args);
 
 /* Linux driver function to map memory regions to user space. */
@@ -97,7 +96,7 @@ struct proc4430_process_context {
 static const struct file_operations proc_4430_fops = {
 	.open = proc4430_drv_open,
 	.release = proc4430_drv_release,
-	.ioctl = proc4430_drv_ioctl,
+	.unlocked_ioctl = proc4430_drv_ioctl,
 	.mmap = proc4430_drv_mmap,
 };
 
@@ -141,7 +140,7 @@ err:
   Linux driver function to invoke the APIs through ioctl.
  *
  */
-static int proc4430_drv_ioctl(struct inode *inode, struct file *filp,
+static long proc4430_drv_ioctl(struct file *filp,
 		unsigned int cmd, unsigned long args)
 {
 	int retval = 0;
diff --git a/drivers/dsp/syslink/procmgr/procmgr_drv.c b/drivers/dsp/syslink/procmgr/procmgr_drv.c
index fb8159fd4d4..dfcafcda6a6 100644
--- a/drivers/dsp/syslink/procmgr/procmgr_drv.c
+++ b/drivers/dsp/syslink/procmgr/procmgr_drv.c
@@ -62,8 +62,7 @@ static int proc_mgr_drv_open(struct inode *inode, struct file *filp);
 static int proc_mgr_drv_release(struct inode *inode, struct file *filp);
 
 /* Linux driver function to invoke the APIs through ioctl. */
-static int proc_mgr_drv_ioctl(struct inode *inode,
-				 struct file *filp,
+static long proc_mgr_drv_ioctl(struct file *filp,
 				 unsigned int cmd,
 				 unsigned long args);
 
@@ -90,7 +89,7 @@ static int __devexit proc_mgr_remove(struct platform_device *pdev);
  */
 static const struct file_operations procmgr_fops = {
 	.open  =  proc_mgr_drv_open,
-	.ioctl =  proc_mgr_drv_ioctl,
+	.unlocked_ioctl =  proc_mgr_drv_ioctl,
 	.release = proc_mgr_drv_release,
 	.mmap = proc_mgr_drv_mmap,
 } ;
@@ -159,7 +158,7 @@ err:
 /*
 * Linux driver function to invoke the APIs through ioctl.
  */
-static int proc_mgr_drv_ioctl(struct inode *inode, struct file *filp,
+static long proc_mgr_drv_ioctl(struct file *filp,
 			unsigned int cmd, unsigned long args)
 {
 	int retval = 0;