From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Tue, 17 Feb 2015 08:44:05 +0000 (-0300)
Subject: [media] radio-bcm2048: use unlocked_ioctl instead of ioctl
X-Git-Tag: v4.1-rc1~59^2~1^2~328
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2e1328dd5a8fd1fa98bf8fca49c5e6df61797a99;p=karo-tx-linux.git

[media] radio-bcm2048: use unlocked_ioctl instead of ioctl

This driver does its own locking, so there is no need to use
ioctl instead of unlocked_ioctl.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
---

diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 7f3d528b6309..297ceaa89b7c 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -2272,7 +2272,7 @@ done:
  */
 static const struct v4l2_file_operations bcm2048_fops = {
 	.owner		= THIS_MODULE,
-	.ioctl		= video_ioctl2,
+	.unlocked_ioctl	= video_ioctl2,
 	/* for RDS read support */
 	.open		= bcm2048_fops_open,
 	.release	= bcm2048_fops_release,