diff options
| author | Subramaniam C.A <subramaniam.ca@ti.com> | 2011-10-25 10:51:17 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-10-25 10:51:17 +0800 |
| commit | f65a1a0fa60de39fd53b22769eb3691d51780ca2 (patch) | |
| tree | 883e9238fe5c069d9b6533bc3aa879891526c184 | |
| parent | 1c581bc0fcd558027e93f46305d2f4fb6a6df1db (diff) | |
omap:palt-mach Use unlocked_ioctl instead of ioctl
This patch uses unlocked_ioctl instead of ioctl. The support for
ioctl was removed since BKL is not to be used anymore
Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/ipu_drv.c | 5 | ||||
| -rw-r--r-- | arch/arm/plat-omap/dmm_user.c | 4 | ||||
| -rw-r--r-- | arch/arm/plat-omap/remoteproc.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/ipu_drv.c b/arch/arm/mach-omap2/ipu_drv.c index 4cbbf50b2a1..bed6dd75236 100644 --- a/arch/arm/mach-omap2/ipu_drv.c +++ b/arch/arm/mach-omap2/ipu_drv.c @@ -116,8 +116,7 @@ static void _resume_stub(void) /* arg should encode the IPU-managed HWMOD * to be suspended, 0 for system wide */ -static int ipu_pm_ioctl(struct inode *inode, struct file *filp, - unsigned int cmd, unsigned long arg) +static long ipu_pm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { int ret = 0; /* struct omap_ipu_pm *ipu_pm = filp->private_data; */ @@ -168,7 +167,7 @@ static int is_driver_init; static const struct file_operations ipm_pm_fops = { .owner = THIS_MODULE, - .ioctl = ipu_pm_ioctl, + .unlocked_ioctl = ipu_pm_ioctl, .open = NULL, }; diff --git a/arch/arm/plat-omap/dmm_user.c b/arch/arm/plat-omap/dmm_user.c index a8e96f8f57e..da4f41579c2 100644 --- a/arch/arm/plat-omap/dmm_user.c +++ b/arch/arm/plat-omap/dmm_user.c @@ -42,7 +42,7 @@ static atomic_t num_of_iovmmus; static struct class *omap_dmm_class; static dev_t omap_dmm_dev; -static int omap_dmm_ioctl(struct inode *inode, struct file *filp, +static long omap_dmm_ioctl(struct file *filp, unsigned int cmd, unsigned long args) { struct iodmm_struct *obj; @@ -166,7 +166,7 @@ static const struct file_operations omap_dmm_fops = { .owner = THIS_MODULE, .open = omap_dmm_open, .release = omap_dmm_release, - .ioctl = omap_dmm_ioctl, + .unlocked_ioctl = omap_dmm_ioctl, }; static int __devinit omap_dmm_probe(struct platform_device *pdev) diff --git a/arch/arm/plat-omap/remoteproc.c b/arch/arm/plat-omap/remoteproc.c index 4f66af4e7e9..6cd2aff8a2b 100644 --- a/arch/arm/plat-omap/remoteproc.c +++ b/arch/arm/plat-omap/remoteproc.c @@ -314,7 +314,7 @@ static int omap_rproc_release(struct inode *inode, struct file *filp) return 0; } -static int omap_rproc_ioctl(struct inode *inode, struct file *filp, +static long omap_rproc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { int rc = 0; @@ -383,7 +383,7 @@ static int omap_rproc_mmap(struct file *filp, struct vm_area_struct *vma) static const struct file_operations omap_rproc_fops = { .open = omap_rproc_open, .release = omap_rproc_release, - .ioctl = omap_rproc_ioctl, + .unlocked_ioctl = omap_rproc_ioctl, .mmap = omap_rproc_mmap, .owner = THIS_MODULE, }; |