Commit ad28497c authored by Sara Bird's avatar Sara Bird Committed by Greg Kroah-Hartman

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: default avatarSara Bird <sara.bird.iar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 15f10bd1
/* drivers/misc/goldfish_audio.c /*
* drivers/misc/goldfish_audio.c
* *
* Copyright (C) 2007 Google, Inc. * Copyright (C) 2007 Google, Inc.
* Copyright (C) 2012 Intel, Inc. * Copyright (C) 2012 Intel, Inc.
...@@ -47,10 +48,11 @@ struct goldfish_audio { ...@@ -47,10 +48,11 @@ struct goldfish_audio {
int read_supported; /* true if we have audio input support */ 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. * We will allocate two read buffers and two write buffers.
Having two write buffers facilitate interleaved IO. * Having two read buffers facilitate stereo -> mono conversion.
*/ * Having two write buffers facilitate interleaved IO.
*/
#define READ_BUFFER_SIZE 16384 #define READ_BUFFER_SIZE 16384
#define WRITE_BUFFER_SIZE 16384 #define WRITE_BUFFER_SIZE 16384
#define COMBINED_BUFFER_SIZE ((2 * READ_BUFFER_SIZE) + \ #define COMBINED_BUFFER_SIZE ((2 * READ_BUFFER_SIZE) + \
...@@ -59,8 +61,10 @@ struct goldfish_audio { ...@@ -59,8 +61,10 @@ struct goldfish_audio {
#define AUDIO_READ(data, addr) (readl(data->reg_base + addr)) #define AUDIO_READ(data, addr) (readl(data->reg_base + addr))
#define AUDIO_WRITE(data, addr, x) (writel(x, 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; static struct goldfish_audio *audio_data;
enum { enum {
...@@ -161,8 +165,10 @@ static ssize_t goldfish_audio_write(struct file *fp, const char __user *buf, ...@@ -161,8 +165,10 @@ static ssize_t goldfish_audio_write(struct file *fp, const char __user *buf,
} }
spin_lock_irqsave(&data->lock, irq_flags); 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) { if (kbuf == data->write_buffer1) {
data->buffer_status &= ~AUDIO_INT_WRITE_BUFFER_1_EMPTY; data->buffer_status &= ~AUDIO_INT_WRITE_BUFFER_1_EMPTY;
AUDIO_WRITE(data, AUDIO_WRITE_BUFFER_1, copy); AUDIO_WRITE(data, AUDIO_WRITE_BUFFER_1, copy);
...@@ -225,8 +231,10 @@ static irqreturn_t goldfish_audio_interrupt(int irq, void *dev_id) ...@@ -225,8 +231,10 @@ static irqreturn_t goldfish_audio_interrupt(int irq, void *dev_id)
/* read buffer status flags */ /* read buffer status flags */
status = AUDIO_READ(data, AUDIO_INT_STATUS); status = AUDIO_READ(data, AUDIO_INT_STATUS);
status &= AUDIO_INT_MASK; 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) { if (status) {
data->buffer_status = status; data->buffer_status = status;
wake_up(&data->wait); wake_up(&data->wait);
......
/* drivers/mtd/devices/goldfish_nand_reg.h /*
** * drivers/mtd/devices/goldfish_nand_reg.h
** Copyright (C) 2007 Google, Inc. *
** * 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 * This software is licensed under the terms of the GNU General Public
** may be copied, distributed, and modified under those terms. * 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 * This program is distributed in the hope that it will be useful,
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * but WITHOUT ANY WARRANTY; without even the implied warranty of
** GNU General Public License for more details. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** * GNU General Public License for more details.
*/ *
*/
#ifndef GOLDFISH_NAND_REG_H #ifndef GOLDFISH_NAND_REG_H
#define GOLDFISH_NAND_REG_H #define GOLDFISH_NAND_REG_H
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment