From: Roman Kiryanov <rkir@xxxxxxxxxx> Linux kernel coding style: spaces are never used for indentation. Signed-off-by: Roman Kiryanov <rkir@xxxxxxxxxx> --- drivers/staging/goldfish/goldfish_audio.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/staging/goldfish/goldfish_audio.c b/drivers/staging/goldfish/goldfish_audio.c index b7004edd3ce2..3a75df1d2a0a 100644 --- a/drivers/staging/goldfish/goldfish_audio.c +++ b/drivers/staging/goldfish/goldfish_audio.c @@ -38,18 +38,19 @@ MODULE_VERSION("1.0"); struct goldfish_audio { char __iomem *reg_base; int irq; + /* lock protects access to buffer_status and to device registers */ spinlock_t lock; wait_queue_head_t wait; char *buffer_virt; /* combined buffer virtual address */ - unsigned long buffer_phys; /* combined buffer physical address */ + unsigned long buffer_phys; /* combined buffer physical address */ char *write_buffer1; /* write buffer 1 virtual address */ char *write_buffer2; /* write buffer 2 virtual address */ char *read_buffer; /* read buffer virtual address */ int buffer_status; - int read_supported; /* true if we have audio input support */ + int read_supported; /* true if we have audio input support */ }; /* @@ -57,9 +58,9 @@ struct goldfish_audio { * 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) + \ +#define READ_BUFFER_SIZE 16384 +#define WRITE_BUFFER_SIZE 16384 +#define COMBINED_BUFFER_SIZE ((2 * READ_BUFFER_SIZE) + \ (2 * WRITE_BUFFER_SIZE)) /* @@ -99,9 +100,9 @@ enum { /* this bit set when it is safe to write more bytes to the buffer */ AUDIO_INT_WRITE_BUFFER_1_EMPTY = 1U << 0, AUDIO_INT_WRITE_BUFFER_2_EMPTY = 1U << 1, - AUDIO_INT_READ_BUFFER_FULL = 1U << 2, + AUDIO_INT_READ_BUFFER_FULL = 1U << 2, - AUDIO_INT_MASK = AUDIO_INT_WRITE_BUFFER_1_EMPTY | + AUDIO_INT_MASK = AUDIO_INT_WRITE_BUFFER_1_EMPTY | AUDIO_INT_WRITE_BUFFER_2_EMPTY | AUDIO_INT_READ_BUFFER_FULL, }; -- 2.18.0.rc2.346.g013aa6912e-goog _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel