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

Commit 1d54b3a4 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] vivid: remove duplicate and unused g/s_edid functions 



I'm not sure how I missed this, but they should be removed.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 751e78d0

drivers/media/platform/vivid/vivid-vid-out.c

+0 −57
Original line number Diff line number Diff line
@@ -1113,63 +1113,6 @@ int vivid_vid_out_s_dv_timings(struct file *file, void *_fh, 
	return 0;

}



#if 0

int vivid_vid_out_g_edid(struct file *file, void *_fh,

			 struct v4l2_edid *edid)

{

	struct vivid_dev *dev = video_drvdata(file);

	struct video_device *vdev = video_devdata(file);



	memset(edid->reserved, 0, sizeof(edid->reserved));

	if (vdev->vfl_dir == VFL_DIR_RX) {

		if (edid->pad >= dev->num_inputs)

			return -EINVAL;

		if (dev->input_type[edid->pad] != HDMI)

			return -EINVAL;

	} else {

		if (edid->pad >= dev->num_outputs)

			return -EINVAL;

		if (dev->output_type[edid->pad] != HDMI)

			return -EINVAL;

	}

	if (edid->start_block == 0 && edid->blocks == 0) {

		edid->blocks = dev->edid_blocks;

		return 0;

	}

	if (dev->edid_blocks == 0)

		return -ENODATA;

	if (edid->start_block >= dev->edid_blocks)

		return -EINVAL;

	if (edid->start_block + edid->blocks > dev->edid_blocks)

		edid->blocks = dev->edid_blocks - edid->start_block;

	memcpy(edid->edid, dev->edid, edid->blocks * 128);

	return 0;

}



int vivid_vid_out_s_edid(struct file *file, void *_fh,

			 struct v4l2_edid *edid)

{

	struct vivid_dev *dev = video_drvdata(file);



	memset(edid->reserved, 0, sizeof(edid->reserved));

	if (edid->pad >= dev->num_inputs)

		return -EINVAL;

	if (dev->input_type[edid->pad] != HDMI || edid->start_block)

		return -EINVAL;

	if (edid->blocks == 0) {

		dev->edid_blocks = 0;

		return 0;

	}

	if (edid->blocks > dev->edid_max_blocks) {

		edid->blocks = dev->edid_max_blocks;

		return -E2BIG;

	}

	dev->edid_blocks = edid->blocks;

	memcpy(dev->edid, edid->edid, edid->blocks * 128);

	return 0;

}

#endif



int vivid_vid_out_g_parm(struct file *file, void *priv,

			  struct v4l2_streamparm *parm)

{

drivers/media/platform/vivid/vivid-vid-out.h

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ int vidioc_g_audout(struct file *file, void *fh, struct v4l2_audioout *vout); 
int vidioc_s_audout(struct file *file, void *fh, const struct v4l2_audioout *vout);

int vivid_vid_out_s_std(struct file *file, void *priv, v4l2_std_id id);

int vivid_vid_out_s_dv_timings(struct file *file, void *_fh, struct v4l2_dv_timings *timings);

int vidioc_g_edid(struct file *file, void *_fh, struct v4l2_edid *edid);

int vivid_vid_out_g_parm(struct file *file, void *priv, struct v4l2_streamparm *parm);



#endif