Commit 1a11cb64 authored by Jaroslav Kysela's avatar Jaroslav Kysela

ALSA: dummy driver - do not use assignment in if condition

checkpatch.pl does not like assignment in if condition
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 54e8e21e
...@@ -47,9 +47,11 @@ MODULE_SUPPORTED_DEVICE("{{ALSA,Dummy soundcard}}"); ...@@ -47,9 +47,11 @@ MODULE_SUPPORTED_DEVICE("{{ALSA,Dummy soundcard}}");
static int emu10k1_playback_constraints(struct snd_pcm_runtime *runtime) static int emu10k1_playback_constraints(struct snd_pcm_runtime *runtime)
{ {
int err; int err;
if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
if (err < 0)
return err; return err;
if ((err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX)) < 0) err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX);
if (err) < 0)
return err; return err;
return 0; return 0;
} }
...@@ -363,7 +365,8 @@ static int snd_card_dummy_playback_open(struct snd_pcm_substream *substream) ...@@ -363,7 +365,8 @@ static int snd_card_dummy_playback_open(struct snd_pcm_substream *substream)
} }
if (substream->pcm->device & 2) if (substream->pcm->device & 2)
runtime->hw.info &= ~(SNDRV_PCM_INFO_MMAP|SNDRV_PCM_INFO_MMAP_VALID); runtime->hw.info &= ~(SNDRV_PCM_INFO_MMAP|SNDRV_PCM_INFO_MMAP_VALID);
if ((err = add_playback_constraints(runtime)) < 0) err = add_playback_constraints(runtime);
if (err < 0)
return err; return err;
return 0; return 0;
...@@ -387,7 +390,8 @@ static int snd_card_dummy_capture_open(struct snd_pcm_substream *substream) ...@@ -387,7 +390,8 @@ static int snd_card_dummy_capture_open(struct snd_pcm_substream *substream)
} }
if (substream->pcm->device & 2) if (substream->pcm->device & 2)
runtime->hw.info &= ~(SNDRV_PCM_INFO_MMAP|SNDRV_PCM_INFO_MMAP_VALID); runtime->hw.info &= ~(SNDRV_PCM_INFO_MMAP|SNDRV_PCM_INFO_MMAP_VALID);
if ((err = add_capture_constraints(runtime)) < 0) err = add_capture_constraints(runtime);
if (err < 0)
return err; return err;
return 0; return 0;
...@@ -431,8 +435,9 @@ static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device, ...@@ -431,8 +435,9 @@ static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device,
struct snd_pcm *pcm; struct snd_pcm *pcm;
int err; int err;
if ((err = snd_pcm_new(dummy->card, "Dummy PCM", device, err = snd_pcm_new(dummy->card, "Dummy PCM", device,
substreams, substreams, &pcm)) < 0) substreams, substreams, &pcm);
if (err < 0)
return err; return err;
dummy->pcm = pcm; dummy->pcm = pcm;
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_card_dummy_playback_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_card_dummy_playback_ops);
...@@ -569,7 +574,8 @@ static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy) ...@@ -569,7 +574,8 @@ static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy)
strcpy(card->mixername, "Dummy Mixer"); strcpy(card->mixername, "Dummy Mixer");
for (idx = 0; idx < ARRAY_SIZE(snd_dummy_controls); idx++) { for (idx = 0; idx < ARRAY_SIZE(snd_dummy_controls); idx++) {
if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_dummy_controls[idx], dummy))) < 0) err = snd_ctl_add(card, snd_ctl_new1(&snd_dummy_controls[idx], dummy));
if (err < 0)
return err; return err;
} }
return 0; return 0;
...@@ -593,10 +599,12 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr) ...@@ -593,10 +599,12 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
pcm_substreams[dev] = 1; pcm_substreams[dev] = 1;
if (pcm_substreams[dev] > MAX_PCM_SUBSTREAMS) if (pcm_substreams[dev] > MAX_PCM_SUBSTREAMS)
pcm_substreams[dev] = MAX_PCM_SUBSTREAMS; pcm_substreams[dev] = MAX_PCM_SUBSTREAMS;
if ((err = snd_card_dummy_pcm(dummy, idx, pcm_substreams[dev])) < 0) err = snd_card_dummy_pcm(dummy, idx, pcm_substreams[dev]);
if (err < 0)
goto __nodev; goto __nodev;
} }
if ((err = snd_card_dummy_new_mixer(dummy)) < 0) err = snd_card_dummy_new_mixer(dummy);
if (err < 0)
goto __nodev; goto __nodev;
strcpy(card->driver, "Dummy"); strcpy(card->driver, "Dummy");
strcpy(card->shortname, "Dummy"); strcpy(card->shortname, "Dummy");
...@@ -604,7 +612,8 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr) ...@@ -604,7 +612,8 @@ static int __devinit snd_dummy_probe(struct platform_device *devptr)
snd_card_set_dev(card, &devptr->dev); snd_card_set_dev(card, &devptr->dev);
if ((err = snd_card_register(card)) == 0) { err = snd_card_register(card);
if (err == 0) {
platform_set_drvdata(devptr, card); platform_set_drvdata(devptr, card);
return 0; return 0;
} }
...@@ -667,7 +676,8 @@ static int __init alsa_card_dummy_init(void) ...@@ -667,7 +676,8 @@ static int __init alsa_card_dummy_init(void)
{ {
int i, cards, err; int i, cards, err;
if ((err = platform_driver_register(&snd_dummy_driver)) < 0) err = platform_driver_register(&snd_dummy_driver);
if (err < 0)
return err; return err;
cards = 0; cards = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment