Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f24479d8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "media: subdev: disallow ioctl for saa6588/davinci" 



This reverts commit 79666b99.  It breaks
the ABI and we do not need this in Android devices at this point in
time.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic9ce7d87c32c313d91a95bcdb21ebb26e81655f0
parent 186c8cf2

drivers/media/i2c/saa6588.c

+2 −2
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ static void saa6588_configure(struct saa6588 *s) 


/* ---------------------------------------------------------------------- */



static long saa6588_command(struct v4l2_subdev *sd, unsigned int cmd, void *arg)

static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)

{

	struct saa6588 *s = to_saa6588(sd);

	struct saa6588_command *a = arg;
@@ -445,7 +445,7 @@ static int saa6588_s_tuner(struct v4l2_subdev *sd, const struct v4l2_tuner *vt) 
/* ----------------------------------------------------------------------- */



static const struct v4l2_subdev_core_ops saa6588_core_ops = {

	.command = saa6588_command,

	.ioctl = saa6588_ioctl,

};



static const struct v4l2_subdev_tuner_ops saa6588_tuner_ops = {

drivers/media/pci/bt8xx/bttv-driver.c

+3 −3
Original line number Diff line number Diff line
@@ -3243,7 +3243,7 @@ static int radio_release(struct file *file) 


	btv->radio_user--;



	bttv_call_all(btv, core, command, SAA6588_CMD_CLOSE, &cmd);

	bttv_call_all(btv, core, ioctl, SAA6588_CMD_CLOSE, &cmd);



	if (btv->radio_user == 0)

		btv->has_radio_tuner = 0;
@@ -3324,7 +3324,7 @@ static ssize_t radio_read(struct file *file, char __user *data, 
	cmd.result = -ENODEV;

	radio_enable(btv);



	bttv_call_all(btv, core, command, SAA6588_CMD_READ, &cmd);

	bttv_call_all(btv, core, ioctl, SAA6588_CMD_READ, &cmd);



	return cmd.result;

}
@@ -3345,7 +3345,7 @@ static __poll_t radio_poll(struct file *file, poll_table *wait) 
	cmd.instance = file;

	cmd.event_list = wait;

	cmd.poll_mask = res;

	bttv_call_all(btv, core, command, SAA6588_CMD_POLL, &cmd);

	bttv_call_all(btv, core, ioctl, SAA6588_CMD_POLL, &cmd);



	return cmd.poll_mask;

}

drivers/media/pci/saa7134/saa7134-video.c

+3 −3
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ static int video_release(struct file *file) 


	saa_call_all(dev, tuner, standby);

	if (vdev->vfl_type == VFL_TYPE_RADIO)

		saa_call_all(dev, core, command, SAA6588_CMD_CLOSE, &cmd);

		saa_call_all(dev, core, ioctl, SAA6588_CMD_CLOSE, &cmd);

	mutex_unlock(&dev->lock);



	return 0;
@@ -1221,7 +1221,7 @@ static ssize_t radio_read(struct file *file, char __user *data, 
	cmd.result = -ENODEV;



	mutex_lock(&dev->lock);

	saa_call_all(dev, core, command, SAA6588_CMD_READ, &cmd);

	saa_call_all(dev, core, ioctl, SAA6588_CMD_READ, &cmd);

	mutex_unlock(&dev->lock);



	return cmd.result;
@@ -1237,7 +1237,7 @@ static __poll_t radio_poll(struct file *file, poll_table *wait) 
	cmd.event_list = wait;

	cmd.poll_mask = 0;

	mutex_lock(&dev->lock);

	saa_call_all(dev, core, command, SAA6588_CMD_POLL, &cmd);

	saa_call_all(dev, core, ioctl, SAA6588_CMD_POLL, &cmd);

	mutex_unlock(&dev->lock);



	return rc | cmd.poll_mask;

drivers/media/platform/davinci/vpbe_display.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int venc_is_second_field(struct vpbe_display *disp_dev) 


	ret = v4l2_subdev_call(vpbe_dev->venc,

			       core,

			       command,

			       ioctl,

			       VENC_GET_FLD,

			       &val);

	if (ret < 0) {

drivers/media/platform/davinci/vpbe_venc.c

+4 −2
Original line number Diff line number Diff line
@@ -534,7 +534,9 @@ static int venc_s_routing(struct v4l2_subdev *sd, u32 input, u32 output, 
	return ret;

}



static long venc_command(struct v4l2_subdev *sd, unsigned int cmd, void *arg)

static long venc_ioctl(struct v4l2_subdev *sd,

			unsigned int cmd,

			void *arg)

{

	u32 val;
@@ -553,7 +555,7 @@ static long venc_command(struct v4l2_subdev *sd, unsigned int cmd, void *arg) 
}



static const struct v4l2_subdev_core_ops venc_core_ops = {

	.command      = venc_command,

	.ioctl      = venc_ioctl,

};



static const struct v4l2_subdev_video_ops venc_video_ops = {