Skip to content

Commit

Permalink
V4L/DVB: Staging: cx25821: fix coding style issues in cx25821-alsa.c
Browse files Browse the repository at this point in the history 
>From 9473816c446a6ca91905fc49a73732f70b5223b4 Mon Sep 17 00:00:00 2001
 This is a patch to the cx25821-alsa.c file that fixes up errors and warnings found by the checkpatch.pl tool

[mchehab@redhat.com: a few adjustments on the comments to improve readability]
Signed-off-by: Olimpiu Pascariu <olimpiu.pascariu@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Olimpiu Pascariu authored and Mauro Carvalho Chehab committed May 18, 2010
1 parent 4d36ec7 commit 8889a8a
Showing 1 changed file with 54 additions and 48 deletions.
102 changes: 54 additions & 48 deletions drivers/staging/cx25821/cx25821-alsa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <linux/pci.h>
#include <linux/slab.h>

#include <asm/delay.h>
#include <linux/delay.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
Expand All @@ -42,10 +42,10 @@

#define AUDIO_SRAM_CHANNEL SRAM_CH08

#define dprintk(level,fmt, arg...) if (debug >= level) \
#define dprintk(level, fmt, arg...) if (debug >= level) \
printk(KERN_INFO "%s/1: " fmt, chip->dev->name , ## arg)

#define dprintk_core(level,fmt, arg...) if (debug >= level) \
#define dprintk_core(level, fmt, arg...) if (debug >= level) \
printk(KERN_DEBUG "%s/1: " fmt, chip->dev->name , ## arg)

/****************************************************************************
Expand Down Expand Up @@ -81,7 +81,6 @@ struct cx25821_audio_dev {

struct snd_pcm_substream *substream;
};
typedef struct cx25821_audio_dev snd_cx25821_card_t;


/****************************************************************************
Expand All @@ -90,7 +89,7 @@ typedef struct cx25821_audio_dev snd_cx25821_card_t;

static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */
static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int enable[SNDRV_CARDS] = { 1,[1 ... (SNDRV_CARDS - 1)] = 1 };
static int enable[SNDRV_CARDS] = { 1, [1 ... (SNDRV_CARDS - 1)] = 1 };

module_param_array(enable, bool, NULL, 0444);
MODULE_PARM_DESC(enable, "Enable cx25821 soundcard. default enabled.");
Expand All @@ -105,7 +104,7 @@ MODULE_PARM_DESC(index, "Index value for cx25821 capture interface(s).");
MODULE_DESCRIPTION("ALSA driver module for cx25821 based capture cards");
MODULE_AUTHOR("Hiep Huynh");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Conexant,25821}"); //"{{Conexant,23881},"
MODULE_SUPPORTED_DEVICE("{{Conexant,25821}"); /* "{{Conexant,23881}," */

static unsigned int debug;
module_param(debug, int, 0644);
Expand Down Expand Up @@ -135,15 +134,15 @@ MODULE_PARM_DESC(debug, "enable debug messages");
* BOARD Specific: Sets audio DMA
*/

static int _cx25821_start_audio_dma(snd_cx25821_card_t * chip)
static int _cx25821_start_audio_dma(struct cx25821_audio_dev *chip)
{
struct cx25821_buffer *buf = chip->buf;
struct cx25821_dev *dev = chip->dev;
struct sram_channel *audio_ch =
&cx25821_sram_channels[AUDIO_SRAM_CHANNEL];
u32 tmp = 0;

// enable output on the GPIO 0 for the MCLK ADC (Audio)
/* enable output on the GPIO 0 for the MCLK ADC (Audio) */
cx25821_set_gpiopin_direction(chip->dev, 0, 0);

/* Make sure RISC/FIFO are off before changing FIFO/RISC settings */
Expand All @@ -158,18 +157,23 @@ static int _cx25821_start_audio_dma(snd_cx25821_card_t * chip)
cx_write(AUD_A_LNGTH, buf->bpl);

/* reset counter */
cx_write(AUD_A_GPCNT_CTL, GP_COUNT_CONTROL_RESET); //GP_COUNT_CONTROL_RESET = 0x3
/* GP_COUNT_CONTROL_RESET = 0x3 */
cx_write(AUD_A_GPCNT_CTL, GP_COUNT_CONTROL_RESET);
atomic_set(&chip->count, 0);

//Set the input mode to 16-bit
/* Set the input mode to 16-bit */
tmp = cx_read(AUD_A_CFG);
cx_write(AUD_A_CFG,
tmp | FLD_AUD_DST_PK_MODE | FLD_AUD_DST_ENABLE |
FLD_AUD_CLK_ENABLE);

//printk(KERN_INFO "DEBUG: Start audio DMA, %d B/line, cmds_start(0x%x)= %d lines/FIFO, %d periods, %d "
// "byte buffer\n", buf->bpl, audio_ch->cmds_start, cx_read(audio_ch->cmds_start + 12)>>1,
// chip->num_periods, buf->bpl * chip->num_periods);
/* printk(KERN_INFO "DEBUG: Start audio DMA, %d B/line,"
"cmds_start(0x%x)= %d lines/FIFO, %d periods, "
"%d byte buffer\n", buf->bpl,
audio_ch->cmds_start,
cx_read(audio_ch->cmds_start + 12)>>1,
chip->num_periods, buf->bpl *chip->num_periods);
*/

/* Enables corresponding bits at AUD_INT_STAT */
cx_write(AUD_A_INT_MSK,
Expand All @@ -182,7 +186,7 @@ static int _cx25821_start_audio_dma(snd_cx25821_card_t * chip)
/* enable audio irqs */
cx_set(PCI_INT_MSK, chip->dev->pci_irqmask | PCI_MSK_AUD_INT);

// Turn on audio downstream fifo and risc enable 0x101
/* Turn on audio downstream fifo and risc enable 0x101 */
tmp = cx_read(AUD_INT_DMA_CTL);
cx_set(AUD_INT_DMA_CTL,
tmp | (FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN));
Expand All @@ -194,7 +198,7 @@ static int _cx25821_start_audio_dma(snd_cx25821_card_t * chip)
/*
* BOARD Specific: Resets audio DMA
*/
static int _cx25821_stop_audio_dma(snd_cx25821_card_t * chip)
static int _cx25821_stop_audio_dma(struct cx25821_audio_dev *chip)
{
struct cx25821_dev *dev = chip->dev;

Expand Down Expand Up @@ -232,13 +236,13 @@ static char *cx25821_aud_irqs[32] = {
/*
* BOARD Specific: Threats IRQ audio specific calls
*/
static void cx25821_aud_irq(snd_cx25821_card_t * chip, u32 status, u32 mask)
static void cx25821_aud_irq(struct cx25821_audio_dev *chip, u32 status,
u32 mask)
{
struct cx25821_dev *dev = chip->dev;

if (0 == (status & mask)) {
if (0 == (status & mask))
return;
}

cx_write(AUD_A_INT_STAT, status);
if (debug > 1 || (status & mask & ~0xff))
Expand Down Expand Up @@ -277,7 +281,7 @@ static void cx25821_aud_irq(snd_cx25821_card_t * chip, u32 status, u32 mask)
*/
static irqreturn_t cx25821_irq(int irq, void *dev_id)
{
snd_cx25821_card_t *chip = dev_id;
struct cx25821_audio_dev *chip = dev_id;
struct cx25821_dev *dev = chip->dev;
u32 status, pci_status;
u32 audint_status, audint_mask;
Expand Down Expand Up @@ -318,11 +322,11 @@ static irqreturn_t cx25821_irq(int irq, void *dev_id)
if (handled)
cx_write(PCI_INT_STAT, pci_status);

out:
out:
return IRQ_RETVAL(handled);
}

static int dsp_buffer_free(snd_cx25821_card_t * chip)
static int dsp_buffer_free(struct cx25821_audio_dev *chip)
{
BUG_ON(!chip->dma_size);

Expand Down Expand Up @@ -363,15 +367,16 @@ static struct snd_pcm_hardware snd_cx25821_digital_hw = {
.period_bytes_max = DEFAULT_FIFO_SIZE / 3,
.periods_min = 1,
.periods_max = AUDIO_LINE_SIZE,
.buffer_bytes_max = (AUDIO_LINE_SIZE * AUDIO_LINE_SIZE), //128*128 = 16384 = 1024 * 16
/* 128 * 128 = 16384 = 1024 * 16 */
.buffer_bytes_max = (AUDIO_LINE_SIZE * AUDIO_LINE_SIZE),
};

/*
* audio pcm capture open callback
*/
static int snd_cx25821_pcm_open(struct snd_pcm_substream *substream)
{
snd_cx25821_card_t *chip = snd_pcm_substream_chip(substream);
struct cx25821_audio_dev *chip = snd_pcm_substream_chip(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
int err;
unsigned int bpl = 0;
Expand All @@ -393,18 +398,19 @@ static int snd_cx25821_pcm_open(struct snd_pcm_substream *substream)

if (cx25821_sram_channels[AUDIO_SRAM_CHANNEL].fifo_size !=
DEFAULT_FIFO_SIZE) {
bpl = cx25821_sram_channels[AUDIO_SRAM_CHANNEL].fifo_size / 3; //since there are 3 audio Clusters
/* since there are 3 audio Clusters */
bpl = cx25821_sram_channels[AUDIO_SRAM_CHANNEL].fifo_size / 3;
bpl &= ~7; /* must be multiple of 8 */

if (bpl > AUDIO_LINE_SIZE) {
if (bpl > AUDIO_LINE_SIZE)
bpl = AUDIO_LINE_SIZE;
}

runtime->hw.period_bytes_min = bpl;
runtime->hw.period_bytes_max = bpl;
}

return 0;
_error:
_error:
dprintk(1, "Error opening PCM!\n");
return err;
}
Expand All @@ -423,7 +429,7 @@ static int snd_cx25821_close(struct snd_pcm_substream *substream)
static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{
snd_cx25821_card_t *chip = snd_pcm_substream_chip(substream);
struct cx25821_audio_dev *chip = snd_pcm_substream_chip(substream);
struct videobuf_dmabuf *dma;

struct cx25821_buffer *buf;
Expand All @@ -445,9 +451,8 @@ static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,
if (NULL == buf)
return -ENOMEM;

if (chip->period_size > AUDIO_LINE_SIZE) {
if (chip->period_size > AUDIO_LINE_SIZE)
chip->period_size = AUDIO_LINE_SIZE;
}

buf->vb.memory = V4L2_MEMORY_MMAP;
buf->vb.field = V4L2_FIELD_NONE;
Expand All @@ -474,7 +479,7 @@ static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,
buf->vb.width, buf->vb.height, 1);
if (ret < 0) {
printk(KERN_INFO
"DEBUG: ERROR after cx25821_risc_databuffer_audio() \n");
"DEBUG: ERROR after cx25821_risc_databuffer_audio()\n");
goto error;
}

Expand All @@ -494,7 +499,7 @@ static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,

return 0;

error:
error:
kfree(buf);
return ret;
}
Expand All @@ -504,7 +509,7 @@ static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,
*/
static int snd_cx25821_hw_free(struct snd_pcm_substream *substream)
{
snd_cx25821_card_t *chip = snd_pcm_substream_chip(substream);
struct cx25821_audio_dev *chip = snd_pcm_substream_chip(substream);

if (substream->runtime->dma_area) {
dsp_buffer_free(chip);
Expand All @@ -528,7 +533,7 @@ static int snd_cx25821_prepare(struct snd_pcm_substream *substream)
static int snd_cx25821_card_trigger(struct snd_pcm_substream *substream,
int cmd)
{
snd_cx25821_card_t *chip = snd_pcm_substream_chip(substream);
struct cx25821_audio_dev *chip = snd_pcm_substream_chip(substream);
int err = 0;

/* Local interrupts are already disabled by ALSA */
Expand Down Expand Up @@ -557,7 +562,7 @@ static int snd_cx25821_card_trigger(struct snd_pcm_substream *substream,
static snd_pcm_uframes_t snd_cx25821_pointer(struct snd_pcm_substream
*substream)
{
snd_cx25821_card_t *chip = snd_pcm_substream_chip(substream);
struct cx25821_audio_dev *chip = snd_pcm_substream_chip(substream);
struct snd_pcm_runtime *runtime = substream->runtime;
u16 count;

Expand Down Expand Up @@ -593,10 +598,11 @@ static struct snd_pcm_ops snd_cx25821_pcm_ops = {
};

/*
* ALSA create a PCM device: Called when initializing the board. Sets up the name and hooks up
* the callbacks
* ALSA create a PCM device: Called when initializing the board.
* Sets up the name and hooks up the callbacks
*/
static int snd_cx25821_pcm(snd_cx25821_card_t * chip, int device, char *name)
static int snd_cx25821_pcm(struct cx25821_audio_dev *chip, int device,
char *name)
{
struct snd_pcm *pcm;
int err;
Expand Down Expand Up @@ -636,7 +642,7 @@ MODULE_DEVICE_TABLE(pci, cx25821_audio_pci_tbl);
* from the file.
*/
/*
static int snd_cx25821_free(snd_cx25821_card_t *chip)
static int snd_cx25821_free(struct cx25821_audio_dev *chip)
{
if (chip->irq >= 0)
free_irq(chip->irq, chip);
Expand All @@ -653,9 +659,9 @@ static int snd_cx25821_free(snd_cx25821_card_t *chip)
*/
static void snd_cx25821_dev_free(struct snd_card *card)
{
snd_cx25821_card_t *chip = card->private_data;
struct cx25821_audio_dev *chip = card->private_data;

//snd_cx25821_free(chip);
/* snd_cx25821_free(chip); */
snd_card_free(chip->card);
}

Expand All @@ -665,23 +671,23 @@ static void snd_cx25821_dev_free(struct snd_card *card)
static int cx25821_audio_initdev(struct cx25821_dev *dev)
{
struct snd_card *card;
snd_cx25821_card_t *chip;
struct cx25821_audio_dev *chip;
int err;

if (devno >= SNDRV_CARDS) {
printk(KERN_INFO "DEBUG ERROR: devno >= SNDRV_CARDS %s\n",
__func__);
return (-ENODEV);
return -ENODEV;
}

if (!enable[devno]) {
++devno;
printk(KERN_INFO "DEBUG ERROR: !enable[devno] %s\n", __func__);
return (-ENOENT);
return -ENOENT;
}

err = snd_card_create(index[devno], id[devno], THIS_MODULE,
sizeof(snd_cx25821_card_t), &card);
sizeof(struct cx25821_audio_dev), &card);
if (err < 0) {
printk(KERN_INFO
"DEBUG ERROR: cannot create snd_card_new in %s\n",
Expand All @@ -693,7 +699,7 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)

/* Card "creation" */
card->private_free = snd_cx25821_dev_free;
chip = (snd_cx25821_card_t *) card->private_data;
chip = (struct cx25821_audio_dev *) card->private_data;
spin_lock_init(&chip->reg_lock);

chip->dev = dev;
Expand All @@ -712,7 +718,7 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)
goto error;
}

if ((err = snd_cx25821_pcm(chip, 0, "cx25821 Digital")) < 0) {
if ((err == snd_cx25821_pcm(chip, 0, "cx25821 Digital")) < 0) {
printk(KERN_INFO
"DEBUG ERROR: cannot create snd_cx25821_pcm %s\n",
__func__);
Expand Down Expand Up @@ -741,7 +747,7 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)
devno++;
return 0;

error:
error:
snd_card_free(card);
return err;
}
Expand Down

0 comments on commit 8889a8a

Please sign in to comment.