projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: usb-audio: Use standard printk helpers
[firefly-linux-kernel-4.4.55.git]
/
sound
/
usb
/
mixer_quirks.c
diff --git
a/sound/usb/mixer_quirks.c
b/sound/usb/mixer_quirks.c
index f4b12c216f1cd55c2db4396746a5abc9f20ed302..f119a41ed9a94986cc1ec1ccd99b1aac3c400260 100644
(file)
--- a/
sound/usb/mixer_quirks.c
+++ b/
sound/usb/mixer_quirks.c
@@
-600,8
+600,8
@@
static int snd_nativeinstruments_control_get(struct snd_kcontrol *kcontrol,
up_read(&mixer->chip->shutdown_rwsem);
if (ret < 0) {
up_read(&mixer->chip->shutdown_rwsem);
if (ret < 0) {
- snd_printk(KERN_ERR
-
"unable to issue vendor read request (ret = %d)", ret);
+ dev_err(&dev->dev,
+ "unable to issue vendor read request (ret = %d)", ret);
return ret;
}
return ret;
}
@@
-631,8
+631,8
@@
static int snd_nativeinstruments_control_put(struct snd_kcontrol *kcontrol,
up_read(&mixer->chip->shutdown_rwsem);
if (ret < 0) {
up_read(&mixer->chip->shutdown_rwsem);
if (ret < 0) {
- snd_printk(KERN_ERR
-
"unable to issue vendor write request (ret = %d)", ret);
+ dev_err(&dev->dev,
+ "unable to issue vendor write request (ret = %d)", ret);
return ret;
}
return ret;
}
@@
-1699,7
+1699,7
@@
void snd_usb_mixer_rc_memory_change(struct usb_mixer_interface *mixer,
snd_usb_mixer_notify_id(mixer, mixer->rc_cfg->mute_mixer_id);
break;
default:
snd_usb_mixer_notify_id(mixer, mixer->rc_cfg->mute_mixer_id);
break;
default:
-
snd_printd(KERN_DEBUG
"memory change in unknown unit %d\n", unitid);
+
usb_audio_dbg(mixer->chip,
"memory change in unknown unit %d\n", unitid);
break;
}
}
break;
}
}