ALSA: pcm: Fix assignment in if condition

There are a few places doing assignments in if condition in ALSA PCM
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-55-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
index 590a46a9e78de4bf2028c33ba66a7b427be4771b..a59de24695ec9b0ea7d20dc309bdf05ef7574286 100644 (file)
--- a/sound/core/pcm_compat.c
+++ b/sound/core/pcm_compat.c
@@ -239,7 +239,8 @@ static int snd_pcm_ioctl_hw_params_compat(struct snd_pcm_substream *substream,
        struct snd_pcm_runtime *runtime;
        int err;
 
-       if (! (runtime = substream->runtime))
+       runtime = substream->runtime;
+       if (!runtime)
                return -ENOTTY;
 
        data = kmalloc(sizeof(*data), GFP_KERNEL);
@@ -343,7 +344,8 @@ static int snd_pcm_ioctl_xfern_compat(struct snd_pcm_substream *substream,
        if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN)
                return -EBADFD;
 
-       if ((ch = substream->runtime->channels) > 128)
+       ch = substream->runtime->channels;
+       if (ch > 128)
                return -EINVAL;
        if (get_user(buf, &data32->bufs) ||
            get_user(frames, &data32->frames))

diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
index 257d412eac5ddb618074e662ad2b0346e19c12e1..4866aed97aacc074b8a88e5ff4218ca59d5b7881 100644 (file)
--- a/sound/core/pcm_misc.c
+++ b/sound/core/pcm_misc.c
@@ -266,7 +266,8 @@ int snd_pcm_format_signed(snd_pcm_format_t format)
        int val;
        if (!valid_format(format))
                return -EINVAL;
-       if ((val = pcm_formats[(INT)format].signd) < 0)
+       val = pcm_formats[(INT)format].signd;
+       if (val < 0)
                return -EINVAL;
        return val;
 }
@@ -314,7 +315,8 @@ int snd_pcm_format_little_endian(snd_pcm_format_t format)
        int val;
        if (!valid_format(format))
                return -EINVAL;
-       if ((val = pcm_formats[(INT)format].le) < 0)
+       val = pcm_formats[(INT)format].le;
+       if (val < 0)
                return -EINVAL;
        return val;
 }
@@ -350,7 +352,8 @@ int snd_pcm_format_width(snd_pcm_format_t format)
        int val;
        if (!valid_format(format))
                return -EINVAL;
-       if ((val = pcm_formats[(INT)format].width) == 0)
+       val = pcm_formats[(INT)format].width;
+       if (!val)
                return -EINVAL;
        return val;
 }
@@ -368,7 +371,8 @@ int snd_pcm_format_physical_width(snd_pcm_format_t format)
        int val;
        if (!valid_format(format))
                return -EINVAL;
-       if ((val = pcm_formats[(INT)format].phys) == 0)
+       val = pcm_formats[(INT)format].phys;
+       if (!val)
                return -EINVAL;
        return val;
 }

diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 11acea02bc74bbde62de8054aca81c914c13764b..eb468573f070b5e03f2d83500beb6092d7351a41 100644 (file)
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -768,7 +768,8 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
 
        if (cpu_latency_qos_request_active(&substream->latency_pm_qos_req))
                cpu_latency_qos_remove_request(&substream->latency_pm_qos_req);
-       if ((usecs = period_to_usecs(runtime)) >= 0)
+       usecs = period_to_usecs(runtime);
+       if (usecs >= 0)
                cpu_latency_qos_add_request(&substream->latency_pm_qos_req,
                                            usecs);
        return 0;
@@ -2658,7 +2659,8 @@ int snd_pcm_open_substream(struct snd_pcm *pcm, int stream,
                goto error;
        }
 
-       if ((err = substream->ops->open(substream)) < 0)
+       err = substream->ops->open(substream);
+       if (err < 0)
                goto error;
 
        substream->hw_opened = 1;