Skip to content

Commit

Permalink
ALSA: mixart: Use standard printk helpers
Browse files Browse the repository at this point in the history 
Convert with dev_err() and co from snd_printk(), etc.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Feb 26, 2014
1 parent be4e6d3 commit 6414e35
Show file tree
Hide file tree
Showing 4 changed files with 163 additions and 85 deletions.
118 changes: 78 additions & 40 deletions sound/pci/mixart/mixart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ static int mixart_set_pipe_state(struct mixart_mgr *mgr,
if(!start) return 0; /* already stopped */
break;
default:
snd_printk(KERN_ERR "error mixart_set_pipe_state called with wrong pipe->status!\n");
dev_err(&mgr->pci->dev,
"error mixart_set_pipe_state called with wrong pipe->status!\n");
return -EINVAL; /* function called with wrong pipe status */
}

Expand All @@ -102,7 +103,8 @@ static int mixart_set_pipe_state(struct mixart_mgr *mgr,

err = snd_mixart_send_msg_wait_notif(mgr, &request, system_msg_uid);
if(err) {
snd_printk(KERN_ERR "error : MSG_SYSTEM_WAIT_SYNCHRO_CMD was not notified !\n");
dev_err(&mgr->pci->dev,
"error : MSG_SYSTEM_WAIT_SYNCHRO_CMD was not notified !\n");
return err;
}

Expand All @@ -123,7 +125,9 @@ static int mixart_set_pipe_state(struct mixart_mgr *mgr,

err = snd_mixart_send_msg(mgr, &request, sizeof(group_state_resp), &group_state_resp);
if (err < 0 || group_state_resp.txx_status != 0) {
snd_printk(KERN_ERR "error MSG_STREAM_ST***_STREAM_GRP_PACKET err=%x stat=%x !\n", err, group_state_resp.txx_status);
dev_err(&mgr->pci->dev,
"error MSG_STREAM_ST***_STREAM_GRP_PACKET err=%x stat=%x !\n",
err, group_state_resp.txx_status);
return -EINVAL;
}

Expand All @@ -134,7 +138,9 @@ static int mixart_set_pipe_state(struct mixart_mgr *mgr,

err = snd_mixart_send_msg(mgr, &request, sizeof(group_state_resp), &group_state_resp);
if (err < 0 || group_state_resp.txx_status != 0) {
snd_printk(KERN_ERR "error MSG_STREAM_START_STREAM_GRP_PACKET err=%x stat=%x !\n", err, group_state_resp.txx_status);
dev_err(&mgr->pci->dev,
"error MSG_STREAM_START_STREAM_GRP_PACKET err=%x stat=%x !\n",
err, group_state_resp.txx_status);
return -EINVAL;
}

Expand All @@ -147,7 +153,9 @@ static int mixart_set_pipe_state(struct mixart_mgr *mgr,

err = snd_mixart_send_msg(mgr, &request, sizeof(stat), &stat);
if (err < 0 || stat != 0) {
snd_printk(KERN_ERR "error MSG_SYSTEM_SEND_SYNCHRO_CMD err=%x stat=%x !\n", err, stat);
dev_err(&mgr->pci->dev,
"error MSG_SYSTEM_SEND_SYNCHRO_CMD err=%x stat=%x !\n",
err, stat);
return -EINVAL;
}

Expand Down Expand Up @@ -178,7 +186,9 @@ static int mixart_set_clock(struct mixart_mgr *mgr,
if(rate == 0)
return 0; /* nothing to do */
else {
snd_printk(KERN_ERR "error mixart_set_clock(%d) called with wrong pipe->status !\n", rate);
dev_err(&mgr->pci->dev,
"error mixart_set_clock(%d) called with wrong pipe->status !\n",
rate);
return -EINVAL;
}
}
Expand All @@ -190,7 +200,7 @@ static int mixart_set_clock(struct mixart_mgr *mgr,
clock_properties.nb_callers = 1; /* only one entry in uid_caller ! */
clock_properties.uid_caller[0] = pipe->group_uid;

snd_printdd("mixart_set_clock to %d kHz\n", rate);
dev_dbg(&mgr->pci->dev, "mixart_set_clock to %d kHz\n", rate);

request.message_id = MSG_CLOCK_SET_PROPERTIES;
request.uid = mgr->uid_console_manager;
Expand All @@ -199,7 +209,9 @@ static int mixart_set_clock(struct mixart_mgr *mgr,

err = snd_mixart_send_msg(mgr, &request, sizeof(clock_prop_resp), &clock_prop_resp);
if (err < 0 || clock_prop_resp.status != 0 || clock_prop_resp.clock_mode != CM_STANDALONE) {
snd_printk(KERN_ERR "error MSG_CLOCK_SET_PROPERTIES err=%x stat=%x mod=%x !\n", err, clock_prop_resp.status, clock_prop_resp.clock_mode);
dev_err(&mgr->pci->dev,
"error MSG_CLOCK_SET_PROPERTIES err=%x stat=%x mod=%x !\n",
err, clock_prop_resp.status, clock_prop_resp.clock_mode);
return -EINVAL;
}

Expand Down Expand Up @@ -252,7 +264,9 @@ snd_mixart_add_ref_pipe(struct snd_mixart *chip, int pcm_number, int capture,
struct mixart_streaming_group sgroup_resp;
} *buf;

snd_printdd("add_ref_pipe audio chip(%d) pcm(%d)\n", chip->chip_idx, pcm_number);
dev_dbg(chip->card->dev,
"add_ref_pipe audio chip(%d) pcm(%d)\n",
chip->chip_idx, pcm_number);

buf = kmalloc(sizeof(*buf), GFP_KERNEL);
if (!buf)
Expand Down Expand Up @@ -302,7 +316,9 @@ snd_mixart_add_ref_pipe(struct snd_mixart *chip, int pcm_number, int capture,

err = snd_mixart_send_msg(chip->mgr, &request, sizeof(buf->sgroup_resp), &buf->sgroup_resp);
if((err < 0) || (buf->sgroup_resp.status != 0)) {
snd_printk(KERN_ERR "error MSG_STREAM_ADD_**PUT_GROUP err=%x stat=%x !\n", err, buf->sgroup_resp.status);
dev_err(chip->card->dev,
"error MSG_STREAM_ADD_**PUT_GROUP err=%x stat=%x !\n",
err, buf->sgroup_resp.status);
kfree(buf);
return NULL;
}
Expand Down Expand Up @@ -343,13 +359,14 @@ int snd_mixart_kill_ref_pipe(struct mixart_mgr *mgr,
/* release the clock */
err = mixart_set_clock( mgr, pipe, 0);
if( err < 0 ) {
snd_printk(KERN_ERR "mixart_set_clock(0) return error!\n");
dev_err(&mgr->pci->dev,
"mixart_set_clock(0) return error!\n");
}

/* stop the pipe */
err = mixart_set_pipe_state(mgr, pipe, 0);
if( err < 0 ) {
snd_printk(KERN_ERR "error stopping pipe!\n");
dev_err(&mgr->pci->dev, "error stopping pipe!\n");
}

request.message_id = MSG_STREAM_DELETE_GROUP;
Expand All @@ -360,7 +377,9 @@ int snd_mixart_kill_ref_pipe(struct mixart_mgr *mgr,
/* delete the pipe */
err = snd_mixart_send_msg(mgr, &request, sizeof(delete_resp), &delete_resp);
if ((err < 0) || (delete_resp.status != 0)) {
snd_printk(KERN_ERR "error MSG_STREAM_DELETE_GROUP err(%x), status(%x)\n", err, delete_resp.status);
dev_err(&mgr->pci->dev,
"error MSG_STREAM_DELETE_GROUP err(%x), status(%x)\n",
err, delete_resp.status);
}

pipe->group_uid = (struct mixart_uid){0,0};
Expand Down Expand Up @@ -414,7 +433,7 @@ static int snd_mixart_trigger(struct snd_pcm_substream *subs, int cmd)
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:

snd_printdd("SNDRV_PCM_TRIGGER_START\n");
dev_dbg(subs->pcm->card->dev, "SNDRV_PCM_TRIGGER_START\n");

/* START_STREAM */
if( mixart_set_stream_state(stream, 1) )
Expand All @@ -431,19 +450,19 @@ static int snd_mixart_trigger(struct snd_pcm_substream *subs, int cmd)

stream->status = MIXART_STREAM_STATUS_OPEN;

snd_printdd("SNDRV_PCM_TRIGGER_STOP\n");
dev_dbg(subs->pcm->card->dev, "SNDRV_PCM_TRIGGER_STOP\n");

break;

case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
/* TODO */
stream->status = MIXART_STREAM_STATUS_PAUSE;
snd_printdd("SNDRV_PCM_PAUSE_PUSH\n");
dev_dbg(subs->pcm->card->dev, "SNDRV_PCM_PAUSE_PUSH\n");
break;
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
/* TODO */
stream->status = MIXART_STREAM_STATUS_RUNNING;
snd_printdd("SNDRV_PCM_PAUSE_RELEASE\n");
dev_dbg(subs->pcm->card->dev, "SNDRV_PCM_PAUSE_RELEASE\n");
break;
default:
return -EINVAL;
Expand All @@ -456,7 +475,8 @@ static int mixart_sync_nonblock_events(struct mixart_mgr *mgr)
unsigned long timeout = jiffies + HZ;
while (atomic_read(&mgr->msg_processed) > 0) {
if (time_after(jiffies, timeout)) {
snd_printk(KERN_ERR "mixart: cannot process nonblock events!\n");
dev_err(&mgr->pci->dev,
"mixart: cannot process nonblock events!\n");
return -EBUSY;
}
schedule_timeout_uninterruptible(1);
Expand All @@ -474,7 +494,7 @@ static int snd_mixart_prepare(struct snd_pcm_substream *subs)

/* TODO de façon non bloquante, réappliquer les hw_params (rate, bits, codec) */

snd_printdd("snd_mixart_prepare\n");
dev_dbg(chip->card->dev, "snd_mixart_prepare\n");

mixart_sync_nonblock_events(chip->mgr);

Expand Down Expand Up @@ -542,11 +562,13 @@ static int mixart_set_format(struct mixart_stream *stream, snd_pcm_format_t form
stream_param.sample_size = 32;
break;
default:
snd_printk(KERN_ERR "error mixart_set_format() : unknown format\n");
dev_err(chip->card->dev,
"error mixart_set_format() : unknown format\n");
return -EINVAL;
}

snd_printdd("set SNDRV_PCM_FORMAT sample_type(%d) sample_size(%d) freq(%d) channels(%d)\n",
dev_dbg(chip->card->dev,
"set SNDRV_PCM_FORMAT sample_type(%d) sample_size(%d) freq(%d) channels(%d)\n",
stream_param.sample_type, stream_param.sample_size, stream_param.sampling_freq, stream->channels);

/* TODO: what else to configure ? */
Expand All @@ -566,7 +588,9 @@ static int mixart_set_format(struct mixart_stream *stream, snd_pcm_format_t form

err = snd_mixart_send_msg(chip->mgr, &request, sizeof(resp), &resp);
if((err < 0) || resp.error_code) {
snd_printk(KERN_ERR "MSG_STREAM_SET_INPUT_STAGE_PARAM err=%x; resp=%x\n", err, resp.error_code);
dev_err(chip->card->dev,
"MSG_STREAM_SET_INPUT_STAGE_PARAM err=%x; resp=%x\n",
err, resp.error_code);
return -EINVAL;
}
return 0;
Expand Down Expand Up @@ -627,8 +651,9 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,
bufferinfo[i].available_length = subs->runtime->dma_bytes;
/* bufferinfo[i].buffer_id is already defined */

snd_printdd("snd_mixart_hw_params(pcm %d) : dma_addr(%x) dma_bytes(%x) subs-number(%d)\n", i,
bufferinfo[i].buffer_address,
dev_dbg(chip->card->dev,
"snd_mixart_hw_params(pcm %d) : dma_addr(%x) dma_bytes(%x) subs-number(%d)\n",
i, bufferinfo[i].buffer_address,
bufferinfo[i].available_length,
subs->number);
}
Expand Down Expand Up @@ -714,14 +739,18 @@ static int snd_mixart_playback_open(struct snd_pcm_substream *subs)
pcm_number = MIXART_PCM_DIGITAL;
runtime->hw = snd_mixart_digital_caps;
}
snd_printdd("snd_mixart_playback_open C%d/P%d/Sub%d\n", chip->chip_idx, pcm_number, subs->number);
dev_dbg(chip->card->dev,
"snd_mixart_playback_open C%d/P%d/Sub%d\n",
chip->chip_idx, pcm_number, subs->number);

/* get stream info */
stream = &(chip->playback_stream[pcm_number][subs->number]);

if (stream->status != MIXART_STREAM_STATUS_FREE){
/* streams in use */
snd_printk(KERN_ERR "snd_mixart_playback_open C%d/P%d/Sub%d in use\n", chip->chip_idx, pcm_number, subs->number);
dev_err(chip->card->dev,
"snd_mixart_playback_open C%d/P%d/Sub%d in use\n",
chip->chip_idx, pcm_number, subs->number);
err = -EBUSY;
goto _exit_open;
}
Expand All @@ -737,7 +766,7 @@ static int snd_mixart_playback_open(struct snd_pcm_substream *subs)
/* start the pipe if necessary */
err = mixart_set_pipe_state(chip->mgr, pipe, 1);
if( err < 0 ) {
snd_printk(KERN_ERR "error starting pipe!\n");
dev_err(chip->card->dev, "error starting pipe!\n");
snd_mixart_kill_ref_pipe(chip->mgr, pipe, 0);
err = -EINVAL;
goto _exit_open;
Expand Down Expand Up @@ -792,14 +821,17 @@ static int snd_mixart_capture_open(struct snd_pcm_substream *subs)

runtime->hw.channels_min = 2; /* for instance, no mono */

snd_printdd("snd_mixart_capture_open C%d/P%d/Sub%d\n", chip->chip_idx, pcm_number, subs->number);
dev_dbg(chip->card->dev, "snd_mixart_capture_open C%d/P%d/Sub%d\n",
chip->chip_idx, pcm_number, subs->number);

/* get stream info */
stream = &(chip->capture_stream[pcm_number]);

if (stream->status != MIXART_STREAM_STATUS_FREE){
/* streams in use */
snd_printk(KERN_ERR "snd_mixart_capture_open C%d/P%d/Sub%d in use\n", chip->chip_idx, pcm_number, subs->number);
dev_err(chip->card->dev,
"snd_mixart_capture_open C%d/P%d/Sub%d in use\n",
chip->chip_idx, pcm_number, subs->number);
err = -EBUSY;
goto _exit_open;
}
Expand All @@ -815,7 +847,7 @@ static int snd_mixart_capture_open(struct snd_pcm_substream *subs)
/* start the pipe if necessary */
err = mixart_set_pipe_state(chip->mgr, pipe, 1);
if( err < 0 ) {
snd_printk(KERN_ERR "error starting pipe!\n");
dev_err(chip->card->dev, "error starting pipe!\n");
snd_mixart_kill_ref_pipe(chip->mgr, pipe, 0);
err = -EINVAL;
goto _exit_open;
Expand Down Expand Up @@ -855,7 +887,8 @@ static int snd_mixart_close(struct snd_pcm_substream *subs)

mutex_lock(&mgr->setup_mutex);

snd_printdd("snd_mixart_close C%d/P%d/Sub%d\n", chip->chip_idx, stream->pcm_number, subs->number);
dev_dbg(chip->card->dev, "snd_mixart_close C%d/P%d/Sub%d\n",
chip->chip_idx, stream->pcm_number, subs->number);

/* sample rate released */
if(--mgr->ref_count_rate == 0) {
Expand All @@ -865,7 +898,9 @@ static int snd_mixart_close(struct snd_pcm_substream *subs)
/* delete pipe */
if (snd_mixart_kill_ref_pipe(mgr, stream->pipe, 0 ) < 0) {

snd_printk(KERN_ERR "error snd_mixart_kill_ref_pipe C%dP%d\n", chip->chip_idx, stream->pcm_number);
dev_err(chip->card->dev,
"error snd_mixart_kill_ref_pipe C%dP%d\n",
chip->chip_idx, stream->pcm_number);
}

stream->pipe = NULL;
Expand Down Expand Up @@ -940,7 +975,8 @@ static int snd_mixart_pcm_analog(struct snd_mixart *chip)
if ((err = snd_pcm_new(chip->card, name, MIXART_PCM_ANALOG,
MIXART_PLAYBACK_STREAMS,
MIXART_CAPTURE_STREAMS, &pcm)) < 0) {
snd_printk(KERN_ERR "cannot create the analog pcm %d\n", chip->chip_idx);
dev_err(chip->card->dev,
"cannot create the analog pcm %d\n", chip->chip_idx);
return err;
}

Expand Down Expand Up @@ -971,7 +1007,8 @@ static int snd_mixart_pcm_digital(struct snd_mixart *chip)
if ((err = snd_pcm_new(chip->card, name, MIXART_PCM_DIGITAL,
MIXART_PLAYBACK_STREAMS,
MIXART_CAPTURE_STREAMS, &pcm)) < 0) {
snd_printk(KERN_ERR "cannot create the digital pcm %d\n", chip->chip_idx);
dev_err(chip->card->dev,
"cannot create the digital pcm %d\n", chip->chip_idx);
return err;
}

Expand Down Expand Up @@ -1014,7 +1051,7 @@ static int snd_mixart_create(struct mixart_mgr *mgr, struct snd_card *card, int

chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (! chip) {
snd_printk(KERN_ERR "cannot allocate chip\n");
dev_err(card->dev, "cannot allocate chip\n");
return -ENOMEM;
}

Expand Down Expand Up @@ -1071,7 +1108,7 @@ static int snd_mixart_free(struct mixart_mgr *mgr)
/* reset board if some firmware was loaded */
if(mgr->dsp_loaded) {
snd_mixart_reset_board(mgr);
snd_printdd("reset miXart !\n");
dev_dbg(&mgr->pci->dev, "reset miXart !\n");
}

/* release the i/o ports */
Expand Down Expand Up @@ -1232,7 +1269,8 @@ static int snd_mixart_probe(struct pci_dev *pci,

/* check if we can restrict PCI DMA transfers to 32 bits */
if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n");
dev_err(&pci->dev,
"architecture does not support 32bit PCI busmaster DMA\n");
pci_disable_device(pci);
return -ENXIO;
}
Expand All @@ -1258,7 +1296,7 @@ static int snd_mixart_probe(struct pci_dev *pci,
mgr->mem[i].phys = pci_resource_start(pci, i);
mgr->mem[i].virt = pci_ioremap_bar(pci, i);
if (!mgr->mem[i].virt) {
printk(KERN_ERR "unable to remap resource 0x%lx\n",
dev_err(&pci->dev, "unable to remap resource 0x%lx\n",
mgr->mem[i].phys);
snd_mixart_free(mgr);
return -EBUSY;
Expand All @@ -1267,7 +1305,7 @@ static int snd_mixart_probe(struct pci_dev *pci,

if (request_irq(pci->irq, snd_mixart_interrupt, IRQF_SHARED,
KBUILD_MODNAME, mgr)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
dev_err(&pci->dev, "unable to grab IRQ %d\n", pci->irq);
snd_mixart_free(mgr);
return -EBUSY;
}
Expand Down Expand Up @@ -1310,7 +1348,7 @@ static int snd_mixart_probe(struct pci_dev *pci,
0, &card);

if (err < 0) {
snd_printk(KERN_ERR "cannot allocate the card %d\n", i);
dev_err(&pci->dev, "cannot allocate the card %d\n", i);
snd_mixart_free(mgr);
return err;
}
Expand Down
Loading

0 comments on commit 6414e35

Please sign in to comment.