staging: bcm2835-audio: Remove redundant substream mask checks

The avail_substreams bit mask is checked for the possible racy
accesses, but this cannot happen in practice; i.e. the assignment and
the check are superfluous.

Let's rip them off.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
index 1c5a87580978a5b2c3e6f2240251f81e03816994..d2f0f609f7373983fc1d8f247cf6063b3cb5ee42 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
@@ -64,8 +64,6 @@ static int snd_bcm2835_ctl_get(struct snd_kcontrol *kcontrol,
 
        mutex_lock(&chip->audio_mutex);
 
-       BUG_ON(!chip && !(chip->avail_substreams & AVAIL_SUBSTREAMS_MASK));
-
        if (kcontrol->private_value == PCM_PLAYBACK_VOLUME)
                ucontrol->value.integer.value[0] = chip2alsa(chip->volume);
        else if (kcontrol->private_value == PCM_PLAYBACK_MUTE)

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
index f2d8b17d0cfe0c0798e70678d3951bd37fb73238..0be185350f337f72483532c4757245d61754911e 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
@@ -118,14 +118,6 @@ static int snd_bcm2835_playback_open_generic(
                goto out;
        }
 
-       /* Check if we are ready */
-       if (!(chip->avail_substreams & (1 << idx))) {
-               /* We are not ready yet */
-               audio_error("substream(%d) device is not ready yet\n", idx);
-               err = -EAGAIN;
-               goto out;
-       }
-
        alsa_stream = kzalloc(sizeof(*alsa_stream), GFP_KERNEL);
        if (!alsa_stream) {
                err = -ENOMEM;

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
index bec361aff4fe86aff010259e58820dca4fd5c6a9..942a38942c2967f6d698c689c10b1cdc19799578 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -523,16 +523,13 @@ int bcm2835_audio_set_ctls(struct bcm2835_chip *chip)
 
        /* change ctls for all substreams */
        for (i = 0; i < MAX_SUBSTREAMS; i++) {
-               if (chip->avail_substreams & (1 << i)) {
-                       if (!chip->alsa_stream[i]) {
-                               LOG_DBG(" No ALSA stream available?! %i:%p (%x)\n", i, chip->alsa_stream[i], chip->avail_substreams);
-                               ret = 0;
-                       } else if (bcm2835_audio_set_ctls_chan(chip->alsa_stream[i], chip) != 0) {
-                               LOG_ERR("Couldn't set the controls for stream %d\n", i);
-                               ret = -1;
-                       } else {
-                               LOG_DBG(" Controls set for stream %d\n", i);
-                       }
+               if (!chip->alsa_stream[i])
+                       continue;
+               if (bcm2835_audio_set_ctls_chan(chip->alsa_stream[i], chip) != 0) {
+                       LOG_ERR("Couldn't set the controls for stream %d\n", i);
+                       ret = -1;
+               } else {
+                       LOG_DBG(" Controls set for stream %d\n", i);
                }
        }
        return ret;

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
index fa04f6bc9858dcdb5d886cfce97d8b546b2382c6..6876a5eadc07f969adcfc6ea84ee4e3c4a426988 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
@@ -280,7 +280,7 @@ static int snd_add_child_device(struct device *device,
        struct snd_card *card;
        struct device *child;
        struct bcm2835_chip *chip;
-       int err, i;
+       int err;
 
        child = snd_create_device(device, &audio_driver->driver,
                                  audio_driver->driver.name);
@@ -325,9 +325,6 @@ static int snd_add_child_device(struct device *device,
                return err;
        }
 
-       for (i = 0; i < numchans; i++)
-               chip->avail_substreams |= (1 << i);
-
        err = snd_card_register(card);
        if (err) {
                dev_err(child, "Failed to register card, error %d\n", err);

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
index 5dc427240a1d759b2df64a8560ebf5eba59f5454..c0e7df4914ed0fdd6515a69c387d6f1c14f5222b 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
@@ -98,8 +98,6 @@ struct bcm2835_chip {
        struct snd_card *card;
        struct snd_pcm *pcm;
        struct snd_pcm *pcm_spdif;
-       /* Bitmat for valid reg_base and irq numbers */
-       unsigned int avail_substreams;
        struct device *dev;
        struct bcm2835_alsa_stream *alsa_stream[MAX_SUBSTREAMS];