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>

diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c
index 264b8ea64bc24893c65df66f46b5a4ee24120040..e95fa275c289357d43cfb5770ae39a8406d610ef 100644 (file)
--- a/sound/core/hwdep.c
+++ b/sound/core/hwdep.c
@@ -195,7 +195,8 @@ static int snd_hwdep_dsp_status(struct snd_hwdep *hw,
                return -ENXIO;
        memset(&info, 0, sizeof(info));
        info.dsp_loaded = hw->dsp_loaded;
-       if ((err = hw->ops.dsp_status(hw, &info)) < 0)
+       err = hw->ops.dsp_status(hw, &info);
+       if (err < 0)
                return err;
        if (copy_to_user(_info, &info, sizeof(info)))
                return -EFAULT;
@@ -500,7 +501,8 @@ static void __init snd_hwdep_proc_init(void)
 {
        struct snd_info_entry *entry;
 
-       if ((entry = snd_info_create_module_entry(THIS_MODULE, "hwdep", NULL)) != NULL) {
+       entry = snd_info_create_module_entry(THIS_MODULE, "hwdep", NULL);
+       if (entry) {
                entry->c.text.read = snd_hwdep_proc_read;
                if (snd_info_register(entry) < 0) {
                        snd_info_free_entry(entry);

diff --git a/sound/core/info_oss.c b/sound/core/info_oss.c
index 83900485dd8c957286d795cf20d91a399b80133f..1ba887c7954e828205cbb65cf1179c12ce2ca7a2 100644 (file)
--- a/sound/core/info_oss.c
+++ b/sound/core/info_oss.c
@@ -31,7 +31,8 @@ int snd_oss_info_register(int dev, int num, char *string)
                return -ENXIO;
        mutex_lock(&strings);
        if (string == NULL) {
-               if ((x = snd_sndstat_strings[num][dev]) != NULL) {
+               x = snd_sndstat_strings[num][dev];
+               if (x) {
                        kfree(x);
                        x = NULL;
                }

diff --git a/sound/core/init.c b/sound/core/init.c
index 228faf9369dc7184ed7b226ec00a70a40f7803e6..1490568efdb0ef6970d4552abf79292b4fc4fdf1 100644 (file)
--- 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);

diff --git a/sound/core/sound.c b/sound/core/sound.c
index af89e51dd44a66b2ec57e7b98b6aa1bc06a25f1e..df5571d9862955fe576be3be5649d67a61e170c3 100644 (file)
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -357,7 +357,8 @@ static void snd_minor_info_read(struct snd_info_entry *entry, struct snd_info_bu
 
        mutex_lock(&sound_mutex);
        for (minor = 0; minor < SNDRV_OS_MINORS; ++minor) {
-               if (!(mptr = snd_minors[minor]))
+               mptr = snd_minors[minor];
+               if (!mptr)
                        continue;
                if (mptr->card >= 0) {
                        if (mptr->device >= 0)

diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index 610f317bea9d1791196f2dc93006b06ee317f43a..7ed0a2a9103524a39bb0cb091454bfcc08b49155 100644 (file)
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -217,7 +217,8 @@ static void snd_minor_info_oss_read(struct snd_info_entry *entry,
 
        mutex_lock(&sound_oss_mutex);
        for (minor = 0; minor < SNDRV_OSS_MINORS; ++minor) {
-               if (!(mptr = snd_oss_minors[minor]))
+               mptr = snd_oss_minors[minor];
+               if (!mptr)
                        continue;
                if (mptr->card >= 0)
                        snd_iprintf(buffer, "%3i: [%i-%2i]: %s\n", minor,