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

Commit e900a317 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "media: v4l2-core: remove the unused code"

parents 0f41fad1 95649b14

drivers/media/radio/rtc6226/radio-rtc6226-common.c

+0 −7
Original line number Diff line number Diff line
@@ -2309,12 +2309,6 @@ static int rtc6226_vidioc_s_hw_freq_seek(struct file *file, void *priv, 
	return retval;

}



static int rtc6226_vidioc_g_fmt_type_private(struct file *file, void *priv,

						struct v4l2_format *f)

{

	return 0;

}



static const struct v4l2_file_operations rtc6226_fops = {

	.owner			= THIS_MODULE,

	.unlocked_ioctl	= video_ioctl2,
@@ -2342,7 +2336,6 @@ const struct v4l2_ioctl_ops rtc6226_ioctl_ops = { 
	.vidioc_s_frequency         =   rtc6226_vidioc_s_frequency,

	.vidioc_s_hw_freq_seek      =   rtc6226_vidioc_s_hw_freq_seek,

	.vidioc_dqbuf               =   rtc6226_vidioc_dqbuf,

	.vidioc_g_fmt_type_private  =	rtc6226_vidioc_g_fmt_type_private,

};



/*

drivers/media/v4l2-core/v4l2-dev.c

+0 −3
Original line number Diff line number Diff line
@@ -728,9 +728,6 @@ static void determine_valid_ioctls(struct video_device *vdev) 
		SET_VALID_IOCTL(ops, VIDIOC_ENUM_DV_TIMINGS, vidioc_enum_dv_timings);

		SET_VALID_IOCTL(ops, VIDIOC_DV_TIMINGS_CAP, vidioc_dv_timings_cap);

		SET_VALID_IOCTL(ops, VIDIOC_G_EDID, vidioc_g_edid);

	} else {

		/* ioctls valid for radio */

		SET_VALID_IOCTL(ops, VIDIOC_DQBUF, vidioc_dqbuf);

	}

	if (is_tx && (is_radio || is_sdr)) {

		/* radio transmitter only ioctls */

drivers/media/v4l2-core/v4l2-ioctl.c

+0 −6
Original line number Diff line number Diff line
@@ -1003,12 +1003,6 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type) 
		if (is_vid && is_tx && ops->vidioc_g_fmt_meta_out)

			return 0;

		break;

#if IS_ENABLED(CONFIG_I2C_RTC6226_QCA)

	case V4L2_BUF_TYPE_PRIVATE:

		if (ops->vidioc_g_fmt_type_private)

			return 0;

		break;

#endif

	default:

		break;

	}

include/media/v4l2-ioctl.h

+0 −5
Original line number Diff line number Diff line
@@ -345,11 +345,6 @@ struct v4l2_ioctl_ops { 
				     struct v4l2_format *f);

	int (*vidioc_g_fmt_meta_out)(struct file *file, void *fh,

				     struct v4l2_format *f);

#if IS_ENABLED(CONFIG_I2C_RTC6226_QCA)

	int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,

					struct v4l2_format *f);

#endif



	/* VIDIOC_S_FMT handlers */

	int (*vidioc_s_fmt_vid_cap)(struct file *file, void *fh,

				    struct v4l2_format *f);