redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging/goldfish: Fixed up incorrect formatted comments. 

The existing comments are using an odd style. Fixed them up to adhereto the
StyleGuide. No code changes.

Signed-off-by: Sara Bird <sara.bird.iar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Sara Bird 2013-05-20 15:32:49 -04:00 committed by Greg Kroah-Hartman
parent 15f10bd143
commit ad28497cdb
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/goldfish/goldfish_audio.c
View File

@ -1,4 +1,5 @@
/* drivers/misc/goldfish_audio.c
/*
* drivers/misc/goldfish_audio.c
*
* Copyright (C) 2007 Google, Inc.
* Copyright (C) 2012 Intel, Inc.
@ -47,10 +48,11 @@ struct goldfish_audio {
int read_supported; /* true if we have audio input support */
};
/* We will allocate two read buffers and two write buffers.
Having two read buffers facilitate stereo -> mono conversion.
Having two write buffers facilitate interleaved IO.
*/
/*
* We will allocate two read buffers and two write buffers.
* Having two read buffers facilitate stereo -> mono conversion.
* Having two write buffers facilitate interleaved IO.
*/
#define READ_BUFFER_SIZE 16384
#define WRITE_BUFFER_SIZE 16384
#define COMBINED_BUFFER_SIZE ((2 * READ_BUFFER_SIZE) + \
@ -59,8 +61,10 @@ struct goldfish_audio {
#define AUDIO_READ(data, addr) (readl(data->reg_base + addr))
#define AUDIO_WRITE(data, addr, x) (writel(x, data->reg_base + addr))
/* temporary variable used between goldfish_audio_probe() and
goldfish_audio_open() */
/*
* temporary variable used between goldfish_audio_probe() and
* goldfish_audio_open()
*/
static struct goldfish_audio *audio_data;
enum {
@ -161,8 +165,10 @@ static ssize_t goldfish_audio_write(struct file *fp, const char __user *buf,
}
spin_lock_irqsave(&data->lock, irq_flags);
/* clear the buffer empty flag, and signal the emulator
* to start writing the buffer */
/*
* clear the buffer empty flag, and signal the emulator
* to start writing the buffer
*/
if (kbuf == data->write_buffer1) {
data->buffer_status &= ~AUDIO_INT_WRITE_BUFFER_1_EMPTY;
AUDIO_WRITE(data, AUDIO_WRITE_BUFFER_1, copy);
@ -225,8 +231,10 @@ static irqreturn_t goldfish_audio_interrupt(int irq, void *dev_id)
/* read buffer status flags */
status = AUDIO_READ(data, AUDIO_INT_STATUS);
status &= AUDIO_INT_MASK;
/* if buffers are newly empty, wake up blocked
goldfish_audio_write() call */
/*
* if buffers are newly empty, wake up blocked
* goldfish_audio_write() call
*/
if (status) {
data->buffer_status = status;
wake_up(&data->wait);

29
drivers/staging/goldfish/goldfish_nand_reg.h
View File

@ -1,17 +1,18 @@
/* drivers/mtd/devices/goldfish_nand_reg.h
**
** Copyright (C) 2007 Google, Inc.
**
** This software is licensed under the terms of the GNU General Public
** License version 2, as published by the Free Software Foundation, and
** may be copied, distributed, and modified under those terms.
**
** This program is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
*/
/*
* drivers/mtd/devices/goldfish_nand_reg.h
*
* Copyright (C) 2007 Google, Inc.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
* may be copied, distributed, and modified under those terms.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef GOLDFISH_NAND_REG_H
#define GOLDFISH_NAND_REG_H