From: "Leonid V. Fedorenchik" <leonidsbox@gmail.com>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>,
Hans Verkuil <hverkuil@xs4all.nl>, Joe Perches <joe@perches.com>,
devel@linuxdriverproject.org, linux-kernel@vger.kernel.org,
"Leonid V. Fedorenchik" <leonidsbox@gmail.com>
Subject: [PATCH 41/44] Staging: cx25821: Replace :? by if-else in cx25821-video.c
Date: Fri, 16 Sep 2011 14:15:14 +0800 [thread overview]
Message-ID: <1316153717-7272-42-git-send-email-leonidsbox@gmail.com> (raw)
In-Reply-To: <1316153717-7272-1-git-send-email-leonidsbox@gmail.com>
Replace :? operator by equivalent if-else statement where in improves
readability. Don't add else branch if it is not needed.
Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
---
drivers/staging/cx25821/cx25821-video.c | 32 +++++++++++++++++++-----------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
index c54d309..084fc08 100644
--- a/drivers/staging/cx25821/cx25821-video.c
+++ b/drivers/staging/cx25821/cx25821-video.c
@@ -599,8 +599,8 @@ int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
if (init_buffer) {
channel_opened = dev->channel_opened;
- channel_opened = (channel_opened < 0
- || channel_opened > 7) ? 7 : channel_opened;
+ if (channel_opened < 0 || channel_opened > 7)
+ channel_opened = 7;
if (dev->channels[channel_opened].pixel_formats ==
PIXEL_FRMT_411)
@@ -840,8 +840,10 @@ static int video_open(struct file *file)
fh->height = 480;
dev->channel_opened = fh->channel_id;
- pix_format = (dev->channels[ch_id].pixel_formats == PIXEL_FRMT_411) ?
- V4L2_PIX_FMT_Y41P : V4L2_PIX_FMT_YUYV;
+ if (dev->channels[ch_id].pixel_formats == PIXEL_FRMT_411)
+ pix_format = V4L2_PIX_FMT_Y41P;
+ else
+ pix_format = V4L2_PIX_FMT_YUYV;
fh->fmt = cx25821_format_by_fourcc(pix_format);
v4l2_prio_open(&dev->channels[ch_id].prio, &fh->prio);
@@ -1124,8 +1126,10 @@ int cx25821_vidioc_try_fmt_vid_cap(struct file *file, void *priv,
maxh = 576;
if (V4L2_FIELD_ANY == field) {
- field = (f->fmt.pix.height > maxh / 2)
- ? V4L2_FIELD_INTERLACED : V4L2_FIELD_TOP;
+ if (f->fmt.pix.height > maxh / 2)
+ field = V4L2_FIELD_INTERLACED;
+ else
+ field = V4L2_FIELD_TOP;
}
switch (field) {
@@ -1847,8 +1851,10 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,
switch (command) {
case SET_VIDEO_STD:
- dev->tvnorm = !strcmp(data_from_user->vid_stdname, "PAL") ?
- V4L2_STD_PAL_BG : V4L2_STD_NTSC_M;
+ if (!strcmp(data_from_user->vid_stdname, "PAL"))
+ dev->tvnorm = V4L2_STD_PAL_BG;
+ else
+ dev->tvnorm = V4L2_STD_NTSC_M;
medusa_set_videostandard(dev);
break;
@@ -1874,11 +1880,13 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,
if (cif_enable) {
if (dev->tvnorm & V4L2_STD_PAL_BG
- || dev->tvnorm & V4L2_STD_PAL_DK)
+ || dev->tvnorm & V4L2_STD_PAL_DK) {
width = 352;
- else
- width = (cif_width == 320 || cif_width == 352) ?
- cif_width : 320;
+ } else {
+ width = cif_width;
+ if (cif_width != 320 && cif_width != 352)
+ width = 320;
+ }
}
if (!(selected_channel <= 7 && selected_channel >= 0)) {
--
1.7.0.4
next prev parent reply other threads:[~2011-09-16 6:19 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-16 6:14 [PATCH 00/44] Staging: cx25821: Fix style issues Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 01/44] Staging: cx25821: Fix labels' placement in cx25821-video.c Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 02/44] Staging: cx25821: Fix function signatures Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 03/44] Staging: cx25821: Fix obscure line endings Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 04/44] Staging: cx25821: Fix indent in comment Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 05/44] Staging: cx25821: Change indent with spaces to tabs 1 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 06/44] Staging: cx25821: Change indent with spaces to tabs 2 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 07/44] Staging: cx25821: Change indent with spaces to tabs 3 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 08/44] Staging: cx25821: Change indent with spaces to tabs 4 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 09/44] Staging: cx25821: Change indent with spaces to tabs 5 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 10/44] Staging: cx25821: Change indent with spaces to tabs 6 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 11/44] Staging: cx25821: Change indent with spaces to tabs 7 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 12/44] Staging: cx25821: Change indent with spaces to tabs 8 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 13/44] Staging: cx25821: Change indent with spaces to tabs 9 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 14/44] Staging: cx25821: Change indent with spaces to tabs 10 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 15/44] Staging: cx25821: Change indent with spaces to tabs 11 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 16/44] Staging: cx25821: Change indent with spaces to tabs 12 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 17/44] Staging: cx25821: Change indent with spaces to tabs 13 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 18/44] Staging: cx25821: Change indent with spaces to tabs 14 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 19/44] Staging: cx25821: Change indent with spaces to tabs 15 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 20/44] Staging: cx25821: Change indent with spaces to tabs 16 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 21/44] Staging: cx25821: Change indent with spaces to tabs 17 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 22/44] Staging: cx25821: Change indent with spaces to tabs 18 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 23/44] Staging: cx25821: Change indent with spaces to tabs 19 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 24/44] Staging: cx25821: Change indent with spaces to tabs 20 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 25/44] Staging: cx25821: Change indent with spaces to tabs 21 Leonid V. Fedorenchik
2011-09-16 6:14 ` [PATCH 26/44] Staging: cx25821: Change indent with spaces to tabs 22 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 27/44] Staging: cx25821: Change indent with spaces to tabs 23 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 28/44] Staging: cx25821: Change indent with spaces to tabs 24 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 29/44] Staging: cx25821: Change indent with spaces to tabs 25 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 30/44] Staging: cx25821: Change indent with spaces to tabs 26 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 31/44] Staging: cx25821: Change indent with spaces to tabs 27 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 32/44] Staging: cx25821: Change indent with spaces to tabs 28 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 33/44] Staging: cx25821: Change indent with spaces to tabs 29 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 34/44] Staging: cx25821: Change indent with spaces to tabs 30 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 35/44] Staging: cx25821: Change indent with spaces to tabs 31 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 36/44] Staging: cx25821: Change indent with spaces to tabs 32 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 37/44] Staging: cx25821: Change indent with spaces to tabs 33 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 38/44] Staging: cx25821: Change indent with spaces to tabs 34 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 39/44] Staging: cx25821: Change indent with spaces to tabs 35 Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 40/44] Staging: cx25821: Fix braces around statements in cx25821-video.c Leonid V. Fedorenchik
2011-09-16 6:15 ` Leonid V. Fedorenchik [this message]
2011-09-16 6:15 ` [PATCH 42/44] Staging: cx25821: cx25821-video.h: Line up constant Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 43/44] Staging: cx25821: cx25821-video.h: Fix indent Leonid V. Fedorenchik
2011-09-16 6:15 ` [PATCH 44/44] Staging: cx25821: cx25821-video.h: Fix long lines Leonid V. Fedorenchik
2011-09-16 18:47 ` [PATCH 00/44] Staging: cx25821: Fix style issues Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316153717-7272-42-git-send-email-leonidsbox@gmail.com \
--to=leonidsbox@gmail.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=hverkuil@xs4all.nl \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox