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

Commit 6b09a21c authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: rename function get_scale() to size_to_scale() 



Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 81685327

drivers/media/usb/em28xx/em28xx-video.c

+4 −4
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ const struct v4l2_ctrl_ops em28xx_ctrl_ops = { 
	.s_ctrl = em28xx_s_ctrl,

};



static void get_scale(struct em28xx *dev,

static void size_to_scale(struct em28xx *dev,

			unsigned int width, unsigned int height,

			unsigned int *hscale, unsigned int *vscale)

{
@@ -889,7 +889,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, 
				      1, 0);

	}



	get_scale(dev, width, height, &hscale, &vscale);

	size_to_scale(dev, width, height, &hscale, &vscale);



	width = (((unsigned long)maxw) << 12) / (hscale + 4096L);

	height = (((unsigned long)maxh) << 12) / (vscale + 4096L);
@@ -923,7 +923,7 @@ static int em28xx_set_video_format(struct em28xx *dev, unsigned int fourcc, 
	dev->height = height;



	/* set new image size */

	get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);

	size_to_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);



	em28xx_resolution_set(dev);
@@ -986,7 +986,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *norm) 
	/* set new image size */

	dev->width = f.fmt.pix.width;

	dev->height = f.fmt.pix.height;

	get_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);

	size_to_scale(dev, dev->width, dev->height, &dev->hscale, &dev->vscale);



	em28xx_resolution_set(dev);

	v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, dev->norm);