From: "Leonid V. Fedorenchik" <leonidsbox@gmail.com>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>,
Namhyung Kim <namhyung@gmail.com>,
Palash Bandyopadhyay <palash.bandyopadhyay@conexant.com>,
Joe Perches <joe@perches.com>, Ilia Mirkin <imirkin@alum.mit.edu>,
Youquan Song <youquan.song@intel.com>,
"Leonid V. Fedorenchik" <leonidsbox@gmail.com>,
devel@linuxdriverproject.org, linux-kernel@vger.kernel.org
Subject: [PATCH 05/36] Staging: cx25821: cx25821-audio-upstream.c: Fix indent
Date: Sat, 22 Oct 2011 13:43:25 +0800 [thread overview]
Message-ID: <1319262236-6498-6-git-send-email-leonidsbox@gmail.com> (raw)
In-Reply-To: <1319262236-6498-1-git-send-email-leonidsbox@gmail.com>
Change wrong indent (with spaces and less than 7 columns) of statements
to tabs.
Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
---
drivers/staging/cx25821/cx25821-audio-upstream.c | 42 +++++++++++-----------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c
index 50e56a6..d7d3a2f 100644
--- a/drivers/staging/cx25821/cx25821-audio-upstream.c
+++ b/drivers/staging/cx25821/cx25821-audio-upstream.c
@@ -107,7 +107,7 @@ static __le32 *cx25821_risc_field_upstream_audio(struct cx25821_dev *dev,
{
unsigned int line;
struct sram_channel *sram_ch =
- dev->channels[dev->_audio_upstream_channel].sram_channels;
+ dev->channels[dev->_audio_upstream_channel].sram_channels;
int offset = 0;
/* scan lines */
@@ -193,7 +193,7 @@ int cx25821_risc_buffer_upstream_audio(struct cx25821_dev *dev,
/* Recalculate virtual address based on frame index */
rp = dev->_risc_virt_addr + RISC_SYNC_INSTRUCTION_SIZE / 4 +
- (AUDIO_RISC_DMA_BUF_SIZE * (frame + 1) / 4);
+ (AUDIO_RISC_DMA_BUF_SIZE * (frame + 1) / 4);
}
return 0;
@@ -218,7 +218,7 @@ void cx25821_free_memory_audio(struct cx25821_dev *dev)
void cx25821_stop_upstream_audio(struct cx25821_dev *dev)
{
struct sram_channel *sram_ch =
- dev->channels[AUDIO_UPSTREAM_SRAM_CHANNEL_B].sram_channels;
+ dev->channels[AUDIO_UPSTREAM_SRAM_CHANNEL_B].sram_channels;
u32 tmp = 0;
if (!dev->_audio_is_running) {
@@ -286,14 +286,14 @@ int cx25821_get_audio_data(struct cx25821_dev *dev,
} else {
if (!(myfile->f_op)) {
pr_err("%s(): File has no file operations registered!\n",
- __func__);
+ __func__);
filp_close(myfile, NULL);
return -EIO;
}
if (!myfile->f_op->read) {
pr_err("%s(): File has no READ operations registered!\n",
- __func__);
+ __func__);
filp_close(myfile, NULL);
return -EIO;
}
@@ -312,7 +312,7 @@ int cx25821_get_audio_data(struct cx25821_dev *dev,
&& dev->_audiodata_buf_virt_addr != NULL) {
memcpy((void *)(dev->_audiodata_buf_virt_addr +
frame_offset / 4), mybuf,
- vfs_read_retval);
+ vfs_read_retval);
}
file_offset += vfs_read_retval;
@@ -345,7 +345,7 @@ static void cx25821_audioups_handler(struct work_struct *work)
if (!dev) {
pr_err("ERROR %s(): since container_of(work_struct) FAILED!\n",
- __func__);
+ __func__);
return;
}
@@ -370,19 +370,19 @@ int cx25821_openfile_audio(struct cx25821_dev *dev,
if (IS_ERR(myfile)) {
const int open_errno = -PTR_ERR(myfile);
pr_err("%s(): ERROR opening file(%s) with errno = %d!\n",
- __func__, dev->_audiofilename, open_errno);
+ __func__, dev->_audiofilename, open_errno);
return PTR_ERR(myfile);
} else {
if (!(myfile->f_op)) {
pr_err("%s(): File has no file operations registered!\n",
- __func__);
+ __func__);
filp_close(myfile, NULL);
return -EIO;
}
if (!myfile->f_op->read) {
pr_err("%s(): File has no READ operations registered!\n",
- __func__);
+ __func__);
filp_close(myfile, NULL);
return -EIO;
}
@@ -454,7 +454,7 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,
if (!dev->_risc_virt_addr) {
printk(KERN_DEBUG
- pr_fmt("ERROR: pci_alloc_consistent() FAILED to allocate memory for RISC program! Returning\n"));
+ pr_fmt("ERROR: pci_alloc_consistent() FAILED to allocate memory for RISC program! Returning\n"));
return -ENOMEM;
}
/* Clear out memory at address */
@@ -469,7 +469,7 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,
if (!dev->_audiodata_buf_virt_addr) {
printk(KERN_DEBUG
- pr_fmt("ERROR: pci_alloc_consistent() FAILED to allocate memory for data buffer! Returning\n"));
+ pr_fmt("ERROR: pci_alloc_consistent() FAILED to allocate memory for data buffer! Returning\n"));
return -ENOMEM;
}
/* Clear out memory at address */
@@ -485,7 +485,7 @@ static int cx25821_audio_upstream_buffer_prepare(struct cx25821_dev *dev,
dev->_audio_lines_count);
if (ret < 0) {
printk(KERN_DEBUG
- pr_fmt("ERROR creating audio upstream RISC programs!\n"));
+ pr_fmt("ERROR creating audio upstream RISC programs!\n"));
goto error;
}
@@ -533,9 +533,9 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num,
if (dev->_risc_virt_start_addr != NULL) {
risc_phys_jump_addr =
- dev->_risc_phys_start_addr +
- RISC_SYNC_INSTRUCTION_SIZE +
- AUDIO_RISC_DMA_BUF_SIZE;
+ dev->_risc_phys_start_addr +
+ RISC_SYNC_INSTRUCTION_SIZE +
+ AUDIO_RISC_DMA_BUF_SIZE;
rp = cx25821_risc_field_upstream_audio(dev,
dev->_risc_virt_start_addr + 1,
@@ -632,7 +632,7 @@ static void cx25821_wait_fifo_enable(struct cx25821_dev *dev,
/* 10 millisecond timeout */
if (count++ > 1000) {
pr_err("ERROR: %s() fifo is NOT turned on. Timeout!\n",
- __func__);
+ __func__);
return;
}
@@ -726,7 +726,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
if (!dev->_irq_audio_queues) {
printk(KERN_DEBUG
- pr_fmt("ERROR: create_singlethread_workqueue() for Audio FAILED!\n"));
+ pr_fmt("ERROR: create_singlethread_workqueue() for Audio FAILED!\n"));
return -ENOMEM;
}
@@ -764,8 +764,8 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
_line_size, 0);
dev->audio_upstream_riscbuf_size =
- AUDIO_RISC_DMA_BUF_SIZE * NUM_AUDIO_PROGS +
- RISC_SYNC_INSTRUCTION_SIZE;
+ AUDIO_RISC_DMA_BUF_SIZE * NUM_AUDIO_PROGS +
+ RISC_SYNC_INSTRUCTION_SIZE;
dev->audio_upstream_databuf_size = AUDIO_DATA_BUF_SZ * NUM_AUDIO_PROGS;
/* Allocating buffers and prepare RISC program */
@@ -773,7 +773,7 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
_line_size);
if (retval < 0) {
pr_err("%s: Failed to set up Audio upstream buffers!\n",
- dev->name);
+ dev->name);
goto error;
}
/* Start RISC engine */
--
1.7.0.4
next prev parent reply other threads:[~2011-10-22 5:46 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-22 5:43 [PATCH 00/36] Staging: cx25821: Clean up patch series Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 01/36] Staging: cx25821: cx25821-alsa.c: Line up comments Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 02/36] Staging: cx25821: cx25821-alsa.c: Add braces to else clause Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 03/36] Staging: cx25821: cx25821-alsa.c: Fix indent Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 04/36] Staging: cx25821: cx25821-alsa.c: Change line endings Leonid V. Fedorenchik
2011-10-22 5:43 ` Leonid V. Fedorenchik [this message]
2011-10-22 5:43 ` [PATCH 06/36] Staging: cx25821: cx25821-audio-upstream.c: Move operators Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 07/36] Staging: cx25821: cx25821-audio-upstream.c: Change line endings Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 08/36] Staging: cx25821: cx25821-audio.h: Line up defines Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 09/36] Staging: cx25821: cx25821-audio.h: Fix multiline defines Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 10/36] Staging: cx25821: cx25821-cards.c: Fix indent Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 11/36] Staging: cx25821: cx25821-core.c: Delete empty line Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 12/36] Staging: cx25821: cx25821-core.c: Fix indent Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 13/36] Staging: cx25821: cx25821-core.c: Change line endings Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 14/36] Staging: cx25821: cx25821-i2c.c: " Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 15/36] Staging: cx25821: cx25821-medusa-defines.h: Fix typo Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 16/36] Staging: cx25821: cx25821-medusa-defines.h: Line up defines Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 17/36] Staging: cx25821: cx25821-medusa-reg.h: " Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 18/36] Staging: cx25821: cx25821-medusa-video.c: Fix comment Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 19/36] Staging: cx25821: cx25821-medusa-video.c: Move operators Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 20/36] Staging: cx25821: cx25821-medusa-video.c: Change line endings Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 21/36] Staging: cx25821: cx25821-video-upstream-ch2.c: Line up comments Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 22/36] Staging: cx25821: cx25821-video-upstream-ch2.c: Fix indent Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 23/36] Staging: cx25821: cx25821-video-upsstream-ch2.c: Move operators Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 24/36] Staging: cx25821: cx25821-video-upstream-ch2.c: Remove braces Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 25/36] Staging: cx25821: cx25821-video-upstream-ch2.c: Change line endings Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 26/36] Staging: cx25821: cx25821-video-upstream.c: Remove braces Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 27/36] Staging: cx25821: cx25821-video-upstream.c: Fix indent Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 28/36] Staging: cx25821: cx25821-video-upstream.c: Change line endings Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 29/36] Staging: cx25821: cx25821-video.c: Delete empty line Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 30/36] Staging: cx25821: cx25821-video.c: Change spaces Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 31/36] Staging: cx25821: cx25821-video.c: Fix assignment Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 32/36] Staging: cx25821: cx25821-video.c: Fix definitions Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 33/36] Staging: cx25821: cx25821-video.c: Move operators Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 34/36] Staging: cx25821: cx25821-video.c: Fix indent Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 35/36] Staging: cx25821: cx25821-video.c: Change line endings Leonid V. Fedorenchik
2011-10-22 5:43 ` [PATCH 36/36] Staging: cx25821: cx25821.h: Line up defines Leonid V. Fedorenchik
2011-10-22 8:19 ` [PATCH 00/36] Staging: cx25821: Clean up patch series Greg KH
2011-10-23 5:36 ` Mauro Carvalho Chehab
2011-10-23 15:24 ` Leonid V. Fedorenchik
2011-10-23 20:45 ` Mauro Carvalho Chehab
2011-10-24 14:46 ` Leonid V. Fedorenchik
2011-10-24 15:49 ` [PATCH] MAINTAINERS: Staging: cx25821: Add L: linux-media Joe Perches
2011-11-19 6:28 ` [PATCH 00/36] Staging: cx25821: Clean up patch series Leonid V. Fedorenchik
2011-11-24 20:42 ` Mauro Carvalho Chehab
2011-11-25 11:29 ` Leonid V. Fedorenchik
2011-10-22 12:50 ` Palash Bandyopadhyay
2011-10-23 15:20 ` Leonid V. Fedorenchik
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=1319262236-6498-6-git-send-email-leonidsbox@gmail.com \
--to=leonidsbox@gmail.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=imirkin@alum.mit.edu \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=namhyung@gmail.com \
--cc=palash.bandyopadhyay@conexant.com \
--cc=youquan.song@intel.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
Powered by JetHome