From: Hans Verkuil Date: Sun, 14 Nov 2010 12:48:24 +0000 (-0300) Subject: [media] si4713: convert to unlocked_ioctl X-Git-Tag: firefly_0821_release~7613^2~3227^2~16 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=725ea8cf1c1f5ba53177d20d2d2f6dbc139b643e;p=firefly-linux-kernel-4.4.55.git [media] si4713: convert to unlocked_ioctl Convert ioctl to unlocked_ioctl. Note that for this driver the locking is done inside the sub-device. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c index 6a435786b63d..3a84c3dcc04c 100644 --- a/drivers/media/radio/radio-si4713.c +++ b/drivers/media/radio/radio-si4713.c @@ -53,7 +53,8 @@ struct radio_si4713_device { /* radio_si4713_fops - file operations interface */ static const struct v4l2_file_operations radio_si4713_fops = { .owner = THIS_MODULE, - .ioctl = video_ioctl2, + /* Note: locking is done at the subdev level in the i2c driver. */ + .unlocked_ioctl = video_ioctl2, }; /* Video4Linux Interface */