From: Doyu Hiroshi (Nokia-D/Helsinki) <hiroshi.doyu@xxxxxxxxx>
dspbridge doesn't need BKL.
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx>
---
drivers/dsp/bridge/rmgr/drv_interface.c | 4 ++--
drivers/dsp/bridge/rmgr/drv_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 9466409..1659e2d 100755
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -197,7 +197,7 @@ static struct GT_Mask driverTrace;
static struct file_operations bridge_fops = {
.open = bridge_open,
.release = bridge_release,
- .ioctl = bridge_ioctl,
+ .unlocked_ioctl = bridge_ioctl,
.mmap = bridge_mmap,
};
@@ -686,7 +686,7 @@ static int bridge_release(struct inode *ip, struct file *filp)
}
/* This function provides IO interface to the bridge driver. */
-static int bridge_ioctl(struct inode *ip, struct file *filp, unsigned int code,
+static int bridge_ioctl(struct file *filp, unsigned int code,
unsigned long args)
{
int status;
diff --git a/drivers/dsp/bridge/rmgr/drv_interface.h b/drivers/dsp/bridge/rmgr/drv_interface.h
index f5b068e..3e77ed0 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.h
+++ b/drivers/dsp/bridge/rmgr/drv_interface.h
@@ -34,7 +34,7 @@ static int __init bridge_init(void); /* Initialize bridge */
static void __exit bridge_exit(void); /* Opposite of initialize */
static int bridge_open(struct inode *, struct file *); /* Open */
static int bridge_release(struct inode *, struct file *); /* Release */
-static int bridge_ioctl(struct inode *, struct file *, unsigned int,
+static int bridge_ioctl(struct file *, unsigned int,
unsigned long);
static int bridge_mmap(struct file *filp, struct vm_area_struct *vma);
#endif /* ifndef _DRV_INTERFACE_H_ */
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
