Skip to content

L
linux
Commit 6414e35d authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: mixart: Use standard printk helpers 

Convert with dev_err() and co from snd_printk(), etc.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent be4e6d3c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 85 deletions
sound/pci/mixart/mixart.c
View file @ 6414e35d
This diff is collapsed.
sound/pci/mixart/mixart_core.c
View file @ 6414e35d
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/pci.h>
#include <asm/io.h> #include <asm/io.h>
#include <sound/core.h> #include <sound/core.h>
...@@ -94,7 +95,8 @@ static int get_msg(struct mixart_mgr *mgr, struct mixart_msg *resp, ...@@ -94,7 +95,8 @@ static int get_msg(struct mixart_mgr *mgr, struct mixart_msg *resp,
if( (size < MSG_DESCRIPTOR_SIZE) || (resp->size < (size - MSG_DESCRIPTOR_SIZE))) { if( (size < MSG_DESCRIPTOR_SIZE) || (resp->size < (size - MSG_DESCRIPTOR_SIZE))) {
err = -EINVAL; err = -EINVAL;
snd_printk(KERN_ERR "problem with response size = %d\n", size); dev_err(&mgr->pci->dev,
"problem with response size = %d\n", size);
goto _clean_exit; goto _clean_exit;
} }
size -= MSG_DESCRIPTOR_SIZE; size -= MSG_DESCRIPTOR_SIZE;
...@@ -161,7 +163,7 @@ static int send_msg( struct mixart_mgr *mgr, ...@@ -161,7 +163,7 @@ static int send_msg( struct mixart_mgr *mgr,
headptr = readl_be(MIXART_MEM(mgr, MSG_INBOUND_FREE_HEAD)); headptr = readl_be(MIXART_MEM(mgr, MSG_INBOUND_FREE_HEAD));
if (tailptr == headptr) { if (tailptr == headptr) {
snd_printk(KERN_ERR "error: no message frame available\n"); dev_err(&mgr->pci->dev, "error: no message frame available\n");
return -EBUSY; return -EBUSY;
} }
...@@ -265,7 +267,8 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int ...@@ -265,7 +267,8 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int
if (! timeout) { if (! timeout) {
/* error - no ack */ /* error - no ack */
mutex_unlock(&mgr->msg_mutex); mutex_unlock(&mgr->msg_mutex);
snd_printk(KERN_ERR "error: no response on msg %x\n", msg_frame); dev_err(&mgr->pci->dev,
"error: no response on msg %x\n", msg_frame);
return -EIO; return -EIO;
} }
...@@ -278,7 +281,7 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int ...@@ -278,7 +281,7 @@ int snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int
err = get_msg(mgr, &resp, msg_frame); err = get_msg(mgr, &resp, msg_frame);
if( request->message_id != resp.message_id ) if( request->message_id != resp.message_id )
snd_printk(KERN_ERR "RESPONSE ERROR!\n"); dev_err(&mgr->pci->dev, "RESPONSE ERROR!\n");
mutex_unlock(&mgr->msg_mutex); mutex_unlock(&mgr->msg_mutex);
return err; return err;
...@@ -321,7 +324,8 @@ int snd_mixart_send_msg_wait_notif(struct mixart_mgr *mgr, ...@@ -321,7 +324,8 @@ int snd_mixart_send_msg_wait_notif(struct mixart_mgr *mgr,
if (! timeout) { if (! timeout) {
/* error - no ack */ /* error - no ack */
mutex_unlock(&mgr->msg_mutex); mutex_unlock(&mgr->msg_mutex);
snd_printk(KERN_ERR "error: notification %x not received\n", notif_event); dev_err(&mgr->pci->dev,
"error: notification %x not received\n", notif_event);
return -EIO; return -EIO;
} }
...@@ -378,7 +382,9 @@ void snd_mixart_msg_tasklet(unsigned long arg) ...@@ -378,7 +382,9 @@ void snd_mixart_msg_tasklet(unsigned long arg)
resp.size = sizeof(mixart_msg_data); resp.size = sizeof(mixart_msg_data);
err = get_msg(mgr, &resp, addr); err = get_msg(mgr, &resp, addr);
if( err < 0 ) { if( err < 0 ) {
snd_printk(KERN_ERR "tasklet: error(%d) reading mf %x\n", err, msg); dev_err(&mgr->pci->dev,
"tasklet: error(%d) reading mf %x\n",
err, msg);
break; break;
} }
...@@ -388,10 +394,13 @@ void snd_mixart_msg_tasklet(unsigned long arg) ...@@ -388,10 +394,13 @@ void snd_mixart_msg_tasklet(unsigned long arg)
case MSG_STREAM_STOP_INPUT_STAGE_PACKET: case MSG_STREAM_STOP_INPUT_STAGE_PACKET:
case MSG_STREAM_STOP_OUTPUT_STAGE_PACKET: case MSG_STREAM_STOP_OUTPUT_STAGE_PACKET:
if(mixart_msg_data[0]) if(mixart_msg_data[0])
snd_printk(KERN_ERR "tasklet : error MSG_STREAM_ST***_***PUT_STAGE_PACKET status=%x\n", mixart_msg_data[0]); dev_err(&mgr->pci->dev,
"tasklet : error MSG_STREAM_ST***_***PUT_STAGE_PACKET status=%x\n",
mixart_msg_data[0]);
break; break;
default: default:
snd_printdd("tasklet received mf(%x) : msg_id(%x) uid(%x, %x) size(%zd)\n", dev_dbg(&mgr->pci->dev,
"tasklet received mf(%x) : msg_id(%x) uid(%x, %x) size(%zd)\n",
msg, resp.message_id, resp.uid.object_id, resp.uid.desc, resp.size); msg, resp.message_id, resp.uid.object_id, resp.uid.desc, resp.size);
break; break;
} }
...@@ -401,7 +410,9 @@ void snd_mixart_msg_tasklet(unsigned long arg) ...@@ -401,7 +410,9 @@ void snd_mixart_msg_tasklet(unsigned long arg)
case MSG_TYPE_COMMAND: case MSG_TYPE_COMMAND:
/* get_msg() necessary */ /* get_msg() necessary */
default: default:
snd_printk(KERN_ERR "tasklet doesn't know what to do with message %x\n", msg); dev_err(&mgr->pci->dev,
"tasklet doesn't know what to do with message %x\n",
msg);
} /* switch type */ } /* switch type */
/* decrement counter */ /* decrement counter */
...@@ -451,7 +462,9 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id) ...@@ -451,7 +462,9 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id)
resp.size = sizeof(mixart_msg_data); resp.size = sizeof(mixart_msg_data);
err = get_msg(mgr, &resp, msg & ~MSG_TYPE_MASK); err = get_msg(mgr, &resp, msg & ~MSG_TYPE_MASK);
if( err < 0 ) { if( err < 0 ) {
snd_printk(KERN_ERR "interrupt: error(%d) reading mf %x\n", err, msg); dev_err(&mgr->pci->dev,
"interrupt: error(%d) reading mf %x\n",
err, msg);
break; break;
} }
...@@ -472,7 +485,8 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id) ...@@ -472,7 +485,8 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id)
struct mixart_stream *stream; struct mixart_stream *stream;
if ((chip_number >= mgr->num_cards) || (pcm_number >= MIXART_PCM_TOTAL) || (sub_number >= MIXART_PLAYBACK_STREAMS)) { if ((chip_number >= mgr->num_cards) || (pcm_number >= MIXART_PCM_TOTAL) || (sub_number >= MIXART_PLAYBACK_STREAMS)) {
snd_printk(KERN_ERR "error MSG_SERVICES_TIMER_NOTIFY buffer_id (%x) pos(%d)\n", dev_err(&mgr->pci->dev,
"error MSG_SERVICES_TIMER_NOTIFY buffer_id (%x) pos(%d)\n",
buffer_id, notify->streams[i].sample_pos_low_part); buffer_id, notify->streams[i].sample_pos_low_part);
break; break;
} }
...@@ -524,18 +538,22 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id) ...@@ -524,18 +538,22 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id)
} }
#endif #endif
((char*)mixart_msg_data)[resp.size - 1] = 0; ((char*)mixart_msg_data)[resp.size - 1] = 0;
snd_printdd("MIXART TRACE : %s\n", (char*)mixart_msg_data); dev_dbg(&mgr->pci->dev,
"MIXART TRACE : %s\n",
(char *)mixart_msg_data);
} }
break; break;
} }
snd_printdd("command %x not handled\n", resp.message_id); dev_dbg(&mgr->pci->dev, "command %x not handled\n",
resp.message_id);
break; break;
case MSG_TYPE_NOTIFY: case MSG_TYPE_NOTIFY:
if(msg & MSG_CANCEL_NOTIFY_MASK) { if(msg & MSG_CANCEL_NOTIFY_MASK) {
msg &= ~MSG_CANCEL_NOTIFY_MASK; msg &= ~MSG_CANCEL_NOTIFY_MASK;
snd_printk(KERN_ERR "canceled notification %x !\n", msg); dev_err(&mgr->pci->dev,
"canceled notification %x !\n", msg);
} }
/* no break, continue ! */ /* no break, continue ! */
case MSG_TYPE_ANSWER: case MSG_TYPE_ANSWER:
...@@ -556,7 +574,8 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id) ...@@ -556,7 +574,8 @@ irqreturn_t snd_mixart_interrupt(int irq, void *dev_id)
break; break;
case MSG_TYPE_REQUEST: case MSG_TYPE_REQUEST:
default: default:
snd_printdd("interrupt received request %x\n", msg); dev_dbg(&mgr->pci->dev,
"interrupt received request %x\n", msg);
/* TODO : are there things to do here ? */ /* TODO : are there things to do here ? */
break; break;
} /* switch on msg type */ } /* switch on msg type */
......
sound/pci/mixart/mixart_hwdep.c
View file @ 6414e35d
...@@ -165,7 +165,8 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr) ...@@ -165,7 +165,8 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr)
err = snd_mixart_send_msg(mgr, &request, sizeof(*connector), connector); err = snd_mixart_send_msg(mgr, &request, sizeof(*connector), connector);
if((err < 0) || (connector->error_code) || (connector->uid_count > MIXART_MAX_PHYS_CONNECTORS)) { if((err < 0) || (connector->error_code) || (connector->uid_count > MIXART_MAX_PHYS_CONNECTORS)) {
snd_printk(KERN_ERR "error MSG_SYSTEM_ENUM_PLAY_CONNECTOR\n"); dev_err(&mgr->pci->dev,
"error MSG_SYSTEM_ENUM_PLAY_CONNECTOR\n");
err = -EINVAL; err = -EINVAL;
goto __error; goto __error;
} }
...@@ -184,7 +185,7 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr) ...@@ -184,7 +185,7 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr)
pipe->uid_left_connector = connector->uid[k]; /* even */ pipe->uid_left_connector = connector->uid[k]; /* even */
} }
/* snd_printk(KERN_DEBUG "playback connector[%d].object_id = %x\n", k, connector->uid[k].object_id); */ /* dev_dbg(&mgr->pci->dev, "playback connector[%d].object_id = %x\n", k, connector->uid[k].object_id); */
/* TODO: really need send_msg MSG_CONNECTOR_GET_AUDIO_INFO for each connector ? perhaps for analog level caps ? */ /* TODO: really need send_msg MSG_CONNECTOR_GET_AUDIO_INFO for each connector ? perhaps for analog level caps ? */
request.message_id = MSG_CONNECTOR_GET_AUDIO_INFO; request.message_id = MSG_CONNECTOR_GET_AUDIO_INFO;
...@@ -194,10 +195,11 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr) ...@@ -194,10 +195,11 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr)
err = snd_mixart_send_msg(mgr, &request, sizeof(*audio_info), audio_info); err = snd_mixart_send_msg(mgr, &request, sizeof(*audio_info), audio_info);
if( err < 0 ) { if( err < 0 ) {
snd_printk(KERN_ERR "error MSG_CONNECTOR_GET_AUDIO_INFO\n"); dev_err(&mgr->pci->dev,
"error MSG_CONNECTOR_GET_AUDIO_INFO\n");
goto __error; goto __error;
} }
/*snd_printk(KERN_DEBUG "play analog_info.analog_level_present = %x\n", audio_info->info.analog_info.analog_level_present);*/ /*dev_dbg(&mgr->pci->dev, "play analog_info.analog_level_present = %x\n", audio_info->info.analog_info.analog_level_present);*/
} }
request.message_id = MSG_SYSTEM_ENUM_RECORD_CONNECTOR; request.message_id = MSG_SYSTEM_ENUM_RECORD_CONNECTOR;
...@@ -207,7 +209,8 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr) ...@@ -207,7 +209,8 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr)
err = snd_mixart_send_msg(mgr, &request, sizeof(*connector), connector); err = snd_mixart_send_msg(mgr, &request, sizeof(*connector), connector);
if((err < 0) || (connector->error_code) || (connector->uid_count > MIXART_MAX_PHYS_CONNECTORS)) { if((err < 0) || (connector->error_code) || (connector->uid_count > MIXART_MAX_PHYS_CONNECTORS)) {
snd_printk(KERN_ERR "error MSG_SYSTEM_ENUM_RECORD_CONNECTOR\n"); dev_err(&mgr->pci->dev,
"error MSG_SYSTEM_ENUM_RECORD_CONNECTOR\n");
err = -EINVAL; err = -EINVAL;
goto __error; goto __error;
} }
...@@ -226,7 +229,7 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr) ...@@ -226,7 +229,7 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr)
pipe->uid_left_connector = connector->uid[k]; /* even */ pipe->uid_left_connector = connector->uid[k]; /* even */
} }
/* snd_printk(KERN_DEBUG "capture connector[%d].object_id = %x\n", k, connector->uid[k].object_id); */ /* dev_dbg(&mgr->pci->dev, "capture connector[%d].object_id = %x\n", k, connector->uid[k].object_id); */
/* TODO: really need send_msg MSG_CONNECTOR_GET_AUDIO_INFO for each connector ? perhaps for analog level caps ? */ /* TODO: really need send_msg MSG_CONNECTOR_GET_AUDIO_INFO for each connector ? perhaps for analog level caps ? */
request.message_id = MSG_CONNECTOR_GET_AUDIO_INFO; request.message_id = MSG_CONNECTOR_GET_AUDIO_INFO;
...@@ -236,10 +239,11 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr) ...@@ -236,10 +239,11 @@ static int mixart_enum_connectors(struct mixart_mgr *mgr)
err = snd_mixart_send_msg(mgr, &request, sizeof(*audio_info), audio_info); err = snd_mixart_send_msg(mgr, &request, sizeof(*audio_info), audio_info);
if( err < 0 ) { if( err < 0 ) {
snd_printk(KERN_ERR "error MSG_CONNECTOR_GET_AUDIO_INFO\n"); dev_err(&mgr->pci->dev,
"error MSG_CONNECTOR_GET_AUDIO_INFO\n");
goto __error; goto __error;
} }
/*snd_printk(KERN_DEBUG "rec analog_info.analog_level_present = %x\n", audio_info->info.analog_info.analog_level_present);*/ /*dev_dbg(&mgr->pci->dev, "rec analog_info.analog_level_present = %x\n", audio_info->info.analog_info.analog_level_present);*/
} }
err = 0; err = 0;
...@@ -272,7 +276,9 @@ static int mixart_enum_physio(struct mixart_mgr *mgr) ...@@ -272,7 +276,9 @@ static int mixart_enum_physio(struct mixart_mgr *mgr)
err = snd_mixart_send_msg(mgr, &request, sizeof(console_mgr), &console_mgr); err = snd_mixart_send_msg(mgr, &request, sizeof(console_mgr), &console_mgr);
if( (err < 0) || (console_mgr.error_code != 0) ) { if( (err < 0) || (console_mgr.error_code != 0) ) {
snd_printk(KERN_DEBUG "error MSG_CONSOLE_GET_CLOCK_UID : err=%x\n", console_mgr.error_code); dev_dbg(&mgr->pci->dev,
"error MSG_CONSOLE_GET_CLOCK_UID : err=%x\n",
console_mgr.error_code);
return -EINVAL; return -EINVAL;
} }
...@@ -286,7 +292,9 @@ static int mixart_enum_physio(struct mixart_mgr *mgr) ...@@ -286,7 +292,9 @@ static int mixart_enum_physio(struct mixart_mgr *mgr)
err = snd_mixart_send_msg(mgr, &request, sizeof(phys_io), &phys_io); err = snd_mixart_send_msg(mgr, &request, sizeof(phys_io), &phys_io);
if( (err < 0) || ( phys_io.error_code != 0 ) ) { if( (err < 0) || ( phys_io.error_code != 0 ) ) {
snd_printk(KERN_ERR "error MSG_SYSTEM_ENUM_PHYSICAL_IO err(%x) error_code(%x)\n", err, phys_io.error_code ); dev_err(&mgr->pci->dev,
"error MSG_SYSTEM_ENUM_PHYSICAL_IO err(%x) error_code(%x)\n",
err, phys_io.error_code);
return -EINVAL; return -EINVAL;
} }
...@@ -322,7 +330,7 @@ static int mixart_first_init(struct mixart_mgr *mgr) ...@@ -322,7 +330,7 @@ static int mixart_first_init(struct mixart_mgr *mgr)
/* this command has no data. response is a 32 bit status */ /* this command has no data. response is a 32 bit status */
err = snd_mixart_send_msg(mgr, &request, sizeof(k), &k); err = snd_mixart_send_msg(mgr, &request, sizeof(k), &k);
if( (err < 0) || (k != 0) ) { if( (err < 0) || (k != 0) ) {
snd_printk(KERN_ERR "error MSG_SYSTEM_SEND_SYNCHRO_CMD\n"); dev_err(&mgr->pci->dev, "error MSG_SYSTEM_SEND_SYNCHRO_CMD\n");
return err == 0 ? -EINVAL : err; return err == 0 ? -EINVAL : err;
} }
...@@ -348,7 +356,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -348,7 +356,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* motherboard xilinx status 5 will say that the board is performing a reset */ /* motherboard xilinx status 5 will say that the board is performing a reset */
if (status_xilinx == 5) { if (status_xilinx == 5) {
snd_printk(KERN_ERR "miXart is resetting !\n"); dev_err(&mgr->pci->dev, "miXart is resetting !\n");
return -EAGAIN; /* try again later */ return -EAGAIN; /* try again later */
} }
...@@ -357,12 +365,13 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -357,12 +365,13 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* xilinx already loaded ? */ /* xilinx already loaded ? */
if (status_xilinx == 4) { if (status_xilinx == 4) {
snd_printk(KERN_DEBUG "xilinx is already loaded !\n"); dev_dbg(&mgr->pci->dev, "xilinx is already loaded !\n");
return 0; return 0;
} }
/* the status should be 0 == "idle" */ /* the status should be 0 == "idle" */
if (status_xilinx != 0) { if (status_xilinx != 0) {
snd_printk(KERN_ERR "xilinx load error ! status = %d\n", dev_err(&mgr->pci->dev,
"xilinx load error ! status = %d\n",
status_xilinx); status_xilinx);
return -EIO; /* modprob -r may help ? */ return -EIO; /* modprob -r may help ? */
} }
...@@ -393,13 +402,14 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -393,13 +402,14 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
case MIXART_MOTHERBOARD_ELF_INDEX: case MIXART_MOTHERBOARD_ELF_INDEX:
if (status_elf == 4) { if (status_elf == 4) {
snd_printk(KERN_DEBUG "elf file already loaded !\n"); dev_dbg(&mgr->pci->dev, "elf file already loaded !\n");
return 0; return 0;
} }
/* the status should be 0 == "idle" */ /* the status should be 0 == "idle" */
if (status_elf != 0) { if (status_elf != 0) {
snd_printk(KERN_ERR "elf load error ! status = %d\n", dev_err(&mgr->pci->dev,
"elf load error ! status = %d\n",
status_elf); status_elf);
return -EIO; /* modprob -r may help ? */ return -EIO; /* modprob -r may help ? */
} }
...@@ -407,7 +417,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -407,7 +417,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* wait for xilinx status == 4 */ /* wait for xilinx status == 4 */
err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_MXLX_STATUS_OFFSET, 1, 4, 500); /* 5sec */ err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_MXLX_STATUS_OFFSET, 1, 4, 500); /* 5sec */
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "xilinx was not loaded or " dev_err(&mgr->pci->dev, "xilinx was not loaded or "
"could not be started\n"); "could not be started\n");
return err; return err;
} }
...@@ -429,7 +439,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -429,7 +439,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* wait for elf status == 4 */ /* wait for elf status == 4 */
err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_ELF_STATUS_OFFSET, 1, 4, 300); /* 3sec */ err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_ELF_STATUS_OFFSET, 1, 4, 300); /* 3sec */
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "elf could not be started\n"); dev_err(&mgr->pci->dev, "elf could not be started\n");
return err; return err;
} }
...@@ -443,7 +453,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -443,7 +453,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* elf and xilinx should be loaded */ /* elf and xilinx should be loaded */
if (status_elf != 4 || status_xilinx != 4) { if (status_elf != 4 || status_xilinx != 4) {
printk(KERN_ERR "xilinx or elf not " dev_err(&mgr->pci->dev, "xilinx or elf not "
"successfully loaded\n"); "successfully loaded\n");
return -EIO; /* modprob -r may help ? */ return -EIO; /* modprob -r may help ? */
} }
...@@ -451,7 +461,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -451,7 +461,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* wait for daughter detection != 0 */ /* wait for daughter detection != 0 */
err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DBRD_PRESENCE_OFFSET, 0, 0, 30); /* 300msec */ err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DBRD_PRESENCE_OFFSET, 0, 0, 30); /* 300msec */
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "error starting elf file\n"); dev_err(&mgr->pci->dev, "error starting elf file\n");
return err; return err;
} }
...@@ -467,7 +477,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -467,7 +477,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* daughter should be idle */ /* daughter should be idle */
if (status_daught != 0) { if (status_daught != 0) {
printk(KERN_ERR "daughter load error ! status = %d\n", dev_err(&mgr->pci->dev,
"daughter load error ! status = %d\n",
status_daught); status_daught);
return -EIO; /* modprob -r may help ? */ return -EIO; /* modprob -r may help ? */
} }
...@@ -487,7 +498,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -487,7 +498,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* wait for status == 2 */ /* wait for status == 2 */
err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DXLX_STATUS_OFFSET, 1, 2, 30); /* 300msec */ err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DXLX_STATUS_OFFSET, 1, 2, 30); /* 300msec */
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "daughter board load error\n"); dev_err(&mgr->pci->dev, "daughter board load error\n");
return err; return err;
} }
...@@ -509,7 +520,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -509,7 +520,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* wait for daughter status == 3 */ /* wait for daughter status == 3 */
err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DXLX_STATUS_OFFSET, 1, 3, 300); /* 3sec */ err = mixart_wait_nice_for_register_value( mgr, MIXART_PSEUDOREG_DXLX_STATUS_OFFSET, 1, 3, 300); /* 3sec */
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR dev_err(&mgr->pci->dev,
"daughter board could not be initialised\n"); "daughter board could not be initialised\n");
return err; return err;
} }
...@@ -520,7 +531,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -520,7 +531,7 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
/* first communication with embedded */ /* first communication with embedded */
err = mixart_first_init(mgr); err = mixart_first_init(mgr);
if (err < 0) { if (err < 0) {
snd_printk(KERN_ERR "miXart could not be set up\n"); dev_err(&mgr->pci->dev, "miXart could not be set up\n");
return err; return err;
} }
...@@ -540,7 +551,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw ...@@ -540,7 +551,8 @@ static int mixart_dsp_load(struct mixart_mgr* mgr, int index, const struct firmw
return err; return err;
} }
snd_printdd("miXart firmware downloaded and successfully set up\n"); dev_dbg(&mgr->pci->dev,
"miXart firmware downloaded and successfully set up\n");
return 0; return 0;
} }
...@@ -559,7 +571,8 @@ int snd_mixart_setup_firmware(struct mixart_mgr *mgr) ...@@ -559,7 +571,8 @@ int snd_mixart_setup_firmware(struct mixart_mgr *mgr)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
sprintf(path, "mixart/%s", fw_files[i]); sprintf(path, "mixart/%s", fw_files[i]);
if (request_firmware(&fw_entry, path, &mgr->pci->dev)) { if (request_firmware(&fw_entry, path, &mgr->pci->dev)) {
snd_printk(KERN_ERR "miXart: can't load firmware %s\n", path); dev_err(&mgr->pci->dev,
"miXart: can't load firmware %s\n", path);
return -ENOENT; return -ENOENT;
} }
/* fake hwdep dsp record */ /* fake hwdep dsp record */
......
sound/pci/mixart/mixart_mixer.c
View file @ 6414e35d
...@@ -329,7 +329,9 @@ static int mixart_update_analog_audio_level(struct snd_mixart* chip, int is_capt ...@@ -329,7 +329,9 @@ static int mixart_update_analog_audio_level(struct snd_mixart* chip, int is_capt
err = snd_mixart_send_msg(chip->mgr, &request, sizeof(resp), &resp); err = snd_mixart_send_msg(chip->mgr, &request, sizeof(resp), &resp);
if((err<0) || (resp.error_code)) { if((err<0) || (resp.error_code)) {
snd_printk(KERN_DEBUG "error MSG_PHYSICALIO_SET_LEVEL card(%d) is_capture(%d) error_code(%x)\n", chip->chip_idx, is_capture, resp.error_code); dev_dbg(chip->card->dev,
"error MSG_PHYSICALIO_SET_LEVEL card(%d) is_capture(%d) error_code(%x)\n",
chip->chip_idx, is_capture, resp.error_code);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
...@@ -762,7 +764,9 @@ int mixart_update_playback_stream_level(struct snd_mixart* chip, int is_aes, int ...@@ -762,7 +764,9 @@ int mixart_update_playback_stream_level(struct snd_mixart* chip, int is_aes, int
err = snd_mixart_send_msg(chip->mgr, &request, sizeof(status), &status); err = snd_mixart_send_msg(chip->mgr, &request, sizeof(status), &status);
if((err<0) || status) { if((err<0) || status) {
snd_printk(KERN_DEBUG "error MSG_STREAM_SET_OUT_STREAM_LEVEL card(%d) status(%x)\n", chip->chip_idx, status); dev_dbg(chip->card->dev,
"error MSG_STREAM_SET_OUT_STREAM_LEVEL card(%d) status(%x)\n",
chip->chip_idx, status);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
...@@ -805,7 +809,9 @@ int mixart_update_capture_stream_level(struct snd_mixart* chip, int is_aes) ...@@ -805,7 +809,9 @@ int mixart_update_capture_stream_level(struct snd_mixart* chip, int is_aes)
err = snd_mixart_send_msg(chip->mgr, &request, sizeof(status), &status); err = snd_mixart_send_msg(chip->mgr, &request, sizeof(status), &status);
if((err<0) || status) { if((err<0) || status) {
snd_printk(KERN_DEBUG "error MSG_STREAM_SET_IN_AUDIO_LEVEL card(%d) status(%x)\n", chip->chip_idx, status); dev_dbg(chip->card->dev,
"error MSG_STREAM_SET_IN_AUDIO_LEVEL card(%d) status(%x)\n",
chip->chip_idx, status);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
...@@ -977,7 +983,9 @@ static int mixart_update_monitoring(struct snd_mixart* chip, int channel) ...@@ -977,7 +983,9 @@ static int mixart_update_monitoring(struct snd_mixart* chip, int channel)
err = snd_mixart_send_msg(chip->mgr, &request, sizeof(resp), &resp); err = snd_mixart_send_msg(chip->mgr, &request, sizeof(resp), &resp);
if((err<0) || resp) { if((err<0) || resp) {
snd_printk(KERN_DEBUG "error MSG_CONNECTOR_SET_OUT_AUDIO_LEVEL card(%d) resp(%x)\n", chip->chip_idx, resp); dev_dbg(chip->card->dev,
"error MSG_CONNECTOR_SET_OUT_AUDIO_LEVEL card(%d) resp(%x)\n",
chip->chip_idx, resp);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7