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

Commit 0e8025b9 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2: make vidioc_s_audio const 



Write-only ioctls should have a const argument in the ioctl op.
Do this conversion for vidioc_s_audio.
Adding const for write-only ioctls was decided during the 2012 Media Workshop.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 85f5fe39

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -3076,7 +3076,7 @@ static int bttv_g_audio(struct file *file, void *priv, struct v4l2_audio *a) 
	return 0;

	return 0;

}

}





static int bttv_s_audio(struct file *file, void *priv, struct v4l2_audio *a)

static int bttv_s_audio(struct file *file, void *priv, const struct v4l2_audio *a)

{

{

	if (unlikely(a->index))

	if (unlikely(a->index))

		return -EINVAL;

		return -EINVAL;
@@ -3480,7 +3480,7 @@ static int radio_s_tuner(struct file *file, void *priv, 
}

}





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

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

					struct v4l2_audio *a)

					const struct v4l2_audio *a)

{

{

	if (unlikely(a->index))

	if (unlikely(a->index))

		return -EINVAL;

		return -EINVAL;

drivers/media/pci/cx18/cx18-ioctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -492,7 +492,7 @@ static int cx18_g_audio(struct file *file, void *fh, struct v4l2_audio *vin) 
	return cx18_get_audio_input(cx, vin->index, vin);

	return cx18_get_audio_input(cx, vin->index, vin);

}

}





static int cx18_s_audio(struct file *file, void *fh, struct v4l2_audio *vout)

static int cx18_s_audio(struct file *file, void *fh, const struct v4l2_audio *vout)

{

{

	struct cx18 *cx = fh2id(fh)->cx;

	struct cx18 *cx = fh2id(fh)->cx;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1426,7 +1426,7 @@ static int vidioc_g_audinput(struct file *file, void *priv, 
}

}





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

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

	struct v4l2_audio *i)

	const struct v4l2_audio *i)

{

{

	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;

	struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;

	if (i->index >= 2)

	if (i->index >= 2)

drivers/media/pci/ivtv/ivtv-ioctl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -784,7 +784,7 @@ static int ivtv_g_audio(struct file *file, void *fh, struct v4l2_audio *vin) 
	return ivtv_get_audio_input(itv, vin->index, vin);

	return ivtv_get_audio_input(itv, vin->index, vin);

}

}





static int ivtv_s_audio(struct file *file, void *fh, struct v4l2_audio *vout)

static int ivtv_s_audio(struct file *file, void *fh, const struct v4l2_audio *vout)

{

{

	struct ivtv *itv = fh2id(fh)->itv;

	struct ivtv *itv = fh2id(fh)->itv;

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -2089,7 +2089,7 @@ static int saa7134_g_audio(struct file *file, void *priv, struct v4l2_audio *a) 
	return 0;

	return 0;

}

}





static int saa7134_s_audio(struct file *file, void *priv, struct v4l2_audio *a)

static int saa7134_s_audio(struct file *file, void *priv, const struct v4l2_audio *a)

{

{

	return 0;

	return 0;

}

}
@@ -2373,7 +2373,7 @@ static int radio_g_audio(struct file *file, void *priv, 
}

}





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

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

					struct v4l2_audio *a)

					const struct v4l2_audio *a)

{

{

	return 0;

	return 0;

}

}