V4L/DVB (10710): zoran: cleanups in an attempt to make the source a bit more readable.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

drivers/media/video/zoran/zoran_card.c

@@ -919,15 +919,12 @@ zoran_check_jpg_settings (struct zoran              *zr,
 			err0++;
 		if (settings->img_x + settings->img_width > BUZ_MAX_WIDTH)
 			err0++;
-		if (settings->img_y + settings->img_height >
-		    BUZ_MAX_HEIGHT / 2)
+		if (settings->img_y + settings->img_height > BUZ_MAX_HEIGHT / 2)
 			err0++;
 		if (settings->HorDcm && settings->VerDcm) {
-			if (settings->img_width %
-			    (16 * settings->HorDcm) != 0)
+			if (settings->img_width % (16 * settings->HorDcm) != 0)
 				err0++;
-			if (settings->img_height %
-			    (8 * settings->VerDcm) != 0)
+			if (settings->img_height % (8 * settings->VerDcm) != 0)
 				err0++;
 		}
 

drivers/media/video/zoran/zoran_driver.c

@@ -2314,7 +2314,7 @@ static int zoran_s_fmt_vid_out(struct file *file, void *__fh,
 	}
 
 	/* we actually need to set 'real' parameters now */
-	if ((fmt->fmt.pix.height * 2) > BUZ_MAX_HEIGHT)
+	if (fmt->fmt.pix.height * 2 > BUZ_MAX_HEIGHT)
 		settings.TmpDcm = 1;
 	else
 		settings.TmpDcm = 2;
@@ -2501,7 +2501,7 @@ static int zoran_reqbufs(struct file *file, void *__fh, struct v4l2_requestbuffe
 	if (fh->v4l_buffers.allocated || fh->jpg_buffers.allocated) {
 		dprintk(1,
 				KERN_ERR
-				"%s: VIDIOC_REQBUFS - buffers allready allocated\n",
+				"%s: VIDIOC_REQBUFS - buffers already allocated\n",
 				ZR_DEVNAME(zr));
 		res = -EBUSY;
 		goto v4l2reqbuf_unlock_and_return;