diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-06-08 17:05:27 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-06-09 18:30:22 +0300 |
| commit | e3ded899667731b7b590016adeb7b5948fdcd658 (patch) | |
| tree | 129fa7664d4780a9bb8962181eb12fccabe959a6 /sound/core/init.c | |
| parent | e7daaeedb4f270126792ae216f406c1ba2b8f4d9 (diff) | |
| download | linux-e3ded899667731b7b590016adeb7b5948fdcd658.tar.xz | |
ALSA: core: Fix assignment in if condition
There are a few places doing assignments in if condition in ALSA core
code, which is a bad coding style that may confuse readers and
occasionally lead to bugs.
This patch is merely for coding-style fixes, no functional changes.
Link: https://lore.kernel.org/r/20210608140540.17885-54-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/init.c')
| -rw-r--r-- | sound/core/init.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 228faf9369dc..1490568efdb0 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -770,7 +770,8 @@ int snd_card_register(struct snd_card *card) card->registered = true; } - if ((err = snd_device_register_all(card)) < 0) + err = snd_device_register_all(card); + if (err < 0) return err; mutex_lock(&snd_card_mutex); if (snd_cards[card->number]) { @@ -813,7 +814,8 @@ static void snd_card_info_read(struct snd_info_entry *entry, for (idx = count = 0; idx < SNDRV_CARDS; idx++) { mutex_lock(&snd_card_mutex); - if ((card = snd_cards[idx]) != NULL) { + card = snd_cards[idx]; + if (card) { count++; snd_iprintf(buffer, "%2i [%-15s]: %s - %s\n", idx, @@ -837,7 +839,8 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer) for (idx = count = 0; idx < SNDRV_CARDS; idx++) { mutex_lock(&snd_card_mutex); - if ((card = snd_cards[idx]) != NULL) { + card = snd_cards[idx]; + if (card) { count++; snd_iprintf(buffer, "%s\n", card->longname); } @@ -859,7 +862,8 @@ static void snd_card_module_info_read(struct snd_info_entry *entry, for (idx = 0; idx < SNDRV_CARDS; idx++) { mutex_lock(&snd_card_mutex); - if ((card = snd_cards[idx]) != NULL) + card = snd_cards[idx]; + if (card) snd_iprintf(buffer, "%2i %s\n", idx, card->module->name); mutex_unlock(&snd_card_mutex); |