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 36/44] Staging: cx25821: Change indent with spaces to tabs 32
Date: Fri, 16 Sep 2011 14:15:09 +0800 [thread overview]
Message-ID: <1316153717-7272-37-git-send-email-leonidsbox@gmail.com> (raw)
In-Reply-To: <1316153717-7272-1-git-send-email-leonidsbox@gmail.com>
Change indent with spaces to tabs.
Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
---
drivers/staging/cx25821/cx25821-video.c | 113 +++++++++++++++----------------
1 files changed, 56 insertions(+), 57 deletions(-)
diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
index 2383feb..aa57b40 100644
--- a/drivers/staging/cx25821/cx25821-video.c
+++ b/drivers/staging/cx25821/cx25821-video.c
@@ -1867,69 +1867,68 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,
cx25821_set_pixel_format(dev, selected_channel,
pix_format);
- break;
-
- case ENABLE_CIF_RESOLUTION:
- selected_channel = data_from_user->decoder_select;
- cif_enable = data_from_user->cif_resolution_enable;
- cif_width = data_from_user->cif_width;
-
- if (cif_enable) {
- if (dev->tvnorm & V4L2_STD_PAL_BG
- || dev->tvnorm & V4L2_STD_PAL_DK)
- width = 352;
- else
- width = (cif_width == 320
- || cif_width == 352) ? cif_width : 320;
- }
-
- if (!(selected_channel <= 7 && selected_channel >= 0)) {
- selected_channel -= 4;
- selected_channel = selected_channel % 8;
- }
-
- if (selected_channel <= 7 && selected_channel >= 0) {
- dev->channels[selected_channel].
- use_cif_resolution = cif_enable;
- dev->channels[selected_channel].cif_width = width;
- } else {
- for (i = 0; i < VID_CHANNEL_NUM; i++) {
- dev->channels[i].use_cif_resolution =
- cif_enable;
- dev->channels[i].cif_width = width;
- }
- }
-
- medusa_set_resolution(dev, width, selected_channel);
- break;
- case REG_READ:
- data_from_user->reg_data = cx_read(data_from_user->reg_address);
- break;
- case REG_WRITE:
- cx_write(data_from_user->reg_address, data_from_user->reg_data);
- break;
- case MEDUSA_READ:
- value =
- cx25821_i2c_read(&dev->i2c_bus[0],
- (u16) data_from_user->reg_address,
- &data_from_user->reg_data);
- break;
- case MEDUSA_WRITE:
- cx25821_i2c_write(&dev->i2c_bus[0],
- (u16) data_from_user->reg_address,
- data_from_user->reg_data);
- break;
- }
+ break;
+
+ case ENABLE_CIF_RESOLUTION:
+ selected_channel = data_from_user->decoder_select;
+ cif_enable = data_from_user->cif_resolution_enable;
+ cif_width = data_from_user->cif_width;
+
+ if (cif_enable) {
+ if (dev->tvnorm & V4L2_STD_PAL_BG
+ || dev->tvnorm & V4L2_STD_PAL_DK)
+ width = 352;
+ else
+ width = (cif_width == 320 || cif_width == 352) ?
+ cif_width : 320;
+ }
+
+ if (!(selected_channel <= 7 && selected_channel >= 0)) {
+ selected_channel -= 4;
+ selected_channel = selected_channel % 8;
+ }
+
+ if (selected_channel <= 7 && selected_channel >= 0) {
+ dev->channels[selected_channel].
+ use_cif_resolution = cif_enable;
+ dev->channels[selected_channel].cif_width = width;
+ } else {
+ for (i = 0; i < VID_CHANNEL_NUM; i++) {
+ dev->channels[i].use_cif_resolution =
+ cif_enable;
+ dev->channels[i].cif_width = width;
+ }
+ }
- return 0;
+ medusa_set_resolution(dev, width, selected_channel);
+ break;
+ case REG_READ:
+ data_from_user->reg_data = cx_read(data_from_user->reg_address);
+ break;
+ case REG_WRITE:
+ cx_write(data_from_user->reg_address, data_from_user->reg_data);
+ break;
+ case MEDUSA_READ:
+ value = cx25821_i2c_read(&dev->i2c_bus[0],
+ (u16) data_from_user->reg_address,
+ &data_from_user->reg_data);
+ break;
+ case MEDUSA_WRITE:
+ cx25821_i2c_write(&dev->i2c_bus[0],
+ (u16) data_from_user->reg_address,
+ data_from_user->reg_data);
+ break;
+ }
+
+ return 0;
}
static long cx25821_video_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
+ unsigned int cmd, unsigned long arg)
{
- int ret = 0;
+ int ret = 0;
- struct cx25821_fh *fh = file->private_data;
+ struct cx25821_fh *fh = file->private_data;
/* check to see if it's the video upstream */
if (fh->channel_id == SRAM_CH09) {
--
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 ` Leonid V. Fedorenchik [this message]
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 ` [PATCH 41/44] Staging: cx25821: Replace :? by if-else " Leonid V. Fedorenchik
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-37-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