GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-04-29 17:44:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ALSA: pcm: Adjust nine function calls together with a variable assignment

Browse source 
The script "checkpatch.pl" pointed information out like the following.

ERROR: do not use assignment in if condition

Thus fix the affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Markus Elfring 2017-08-23 09:20:29 +02:00 • committed by Takashi Iwai
parent 97d15a141f
commit c8da9be4a7
1 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
sound/core/pcm.c
View file

@ -523,7 +523,9 @@ static int snd_pcm_stream_proc_init(struct snd_pcm_str *pstr)
sprintf(name, "pcm%i%c", pcm->device, sprintf(name, "pcm%i%c", pcm->device,
pstr->stream == SNDRV_PCM_STREAM_PLAYBACK ? 'p' : 'c'); pstr->stream == SNDRV_PCM_STREAM_PLAYBACK ? 'p' : 'c');
if ((entry = snd_info_create_card_entry(pcm->card, name, pcm->card->proc_root)) == NULL) entry = snd_info_create_card_entry(pcm->card, name,
pcm->card->proc_root);
if (!entry)
return -ENOMEM; return -ENOMEM;
entry->mode = S_IFDIR | S_IRUGO | S_IXUGO; entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
if (snd_info_register(entry) < 0) { if (snd_info_register(entry) < 0) {
@ -531,8 +533,8 @@ static int snd_pcm_stream_proc_init(struct snd_pcm_str *pstr)
return -ENOMEM; return -ENOMEM;
} }
pstr->proc_root = entry; pstr->proc_root = entry;
entry = snd_info_create_card_entry(pcm->card, "info", pstr->proc_root);
if ((entry = snd_info_create_card_entry(pcm->card, "info", pstr->proc_root)) != NULL) { if (entry) {
snd_info_set_text_ops(entry, pstr, snd_pcm_stream_proc_info_read); snd_info_set_text_ops(entry, pstr, snd_pcm_stream_proc_info_read);
if (snd_info_register(entry) < 0) { if (snd_info_register(entry) < 0) {
snd_info_free_entry(entry); snd_info_free_entry(entry);
@ -542,8 +544,9 @@ static int snd_pcm_stream_proc_init(struct snd_pcm_str *pstr)
pstr->proc_info_entry = entry; pstr->proc_info_entry = entry;
#ifdef CONFIG_SND_PCM_XRUN_DEBUG #ifdef CONFIG_SND_PCM_XRUN_DEBUG
if ((entry = snd_info_create_card_entry(pcm->card, "xrun_debug", entry = snd_info_create_card_entry(pcm->card, "xrun_debug",
pstr->proc_root)) != NULL) { pstr->proc_root);
if (entry) {
entry->c.text.read = snd_pcm_xrun_debug_read; entry->c.text.read = snd_pcm_xrun_debug_read;
entry->c.text.write = snd_pcm_xrun_debug_write; entry->c.text.write = snd_pcm_xrun_debug_write;
entry->mode |= S_IWUSR; entry->mode |= S_IWUSR;
@ -580,7 +583,9 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
card = substream->pcm->card; card = substream->pcm->card;
sprintf(name, "sub%i", substream->number); sprintf(name, "sub%i", substream->number);
if ((entry = snd_info_create_card_entry(card, name, substream->pstr->proc_root)) == NULL) entry = snd_info_create_card_entry(card, name,
substream->pstr->proc_root);
if (!entry)
return -ENOMEM; return -ENOMEM;
entry->mode = S_IFDIR | S_IRUGO | S_IXUGO; entry->mode = S_IFDIR | S_IRUGO | S_IXUGO;
if (snd_info_register(entry) < 0) { if (snd_info_register(entry) < 0) {
@ -588,8 +593,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
return -ENOMEM; return -ENOMEM;
} }
substream->proc_root = entry; substream->proc_root = entry;
entry = snd_info_create_card_entry(card, "info", substream->proc_root);
if ((entry = snd_info_create_card_entry(card, "info", substream->proc_root)) != NULL) { if (entry) {
snd_info_set_text_ops(entry, substream, snd_info_set_text_ops(entry, substream,
snd_pcm_substream_proc_info_read); snd_pcm_substream_proc_info_read);
if (snd_info_register(entry) < 0) { if (snd_info_register(entry) < 0) {
@ -598,8 +603,9 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
} }
} }
substream->proc_info_entry = entry; substream->proc_info_entry = entry;
entry = snd_info_create_card_entry(card, "hw_params",
if ((entry = snd_info_create_card_entry(card, "hw_params", substream->proc_root)) != NULL) { substream->proc_root);
if (entry) {
snd_info_set_text_ops(entry, substream, snd_info_set_text_ops(entry, substream,
snd_pcm_substream_proc_hw_params_read); snd_pcm_substream_proc_hw_params_read);
if (snd_info_register(entry) < 0) { if (snd_info_register(entry) < 0) {
@ -608,8 +614,9 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
} }
} }
substream->proc_hw_params_entry = entry; substream->proc_hw_params_entry = entry;
entry = snd_info_create_card_entry(card, "sw_params",
if ((entry = snd_info_create_card_entry(card, "sw_params", substream->proc_root)) != NULL) { substream->proc_root);
if (entry) {
snd_info_set_text_ops(entry, substream, snd_info_set_text_ops(entry, substream,
snd_pcm_substream_proc_sw_params_read); snd_pcm_substream_proc_sw_params_read);
if (snd_info_register(entry) < 0) { if (snd_info_register(entry) < 0) {
@ -618,8 +625,8 @@ static int snd_pcm_substream_proc_init(struct snd_pcm_substream *substream)
} }
} }
substream->proc_sw_params_entry = entry; substream->proc_sw_params_entry = entry;
entry = snd_info_create_module_entry(THIS_MODULE, "pcm", NULL);
if ((entry = snd_info_create_card_entry(card, "status", substream->proc_root)) != NULL) { if (entry) {
snd_info_set_text_ops(entry, substream, snd_info_set_text_ops(entry, substream,
snd_pcm_substream_proc_status_read); snd_pcm_substream_proc_status_read);
if (snd_info_register(entry) < 0) { if (snd_info_register(entry) < 0) {
@ -1230,7 +1237,8 @@ static void snd_pcm_proc_init(void)
{ {
struct snd_info_entry *entry; struct snd_info_entry *entry;
if ((entry = snd_info_create_module_entry(THIS_MODULE, "pcm", NULL)) != NULL) { entry = snd_info_create_module_entry(THIS_MODULE, "pcm", NULL);
if (entry) {
snd_info_set_text_ops(entry, NULL, snd_pcm_proc_read); snd_info_set_text_ops(entry, NULL, snd_pcm_proc_read);
if (snd_info_register(entry) < 0) { if (snd_info_register(entry) < 0) {
snd_info_free_entry(entry); snd_info_free_entry(entry);