leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: als300: Fix assignment in if condition

Browse Source 
PCI ALS300 driver code contains a few assignments in if condition,
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-18-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2021-06-08 16:04:51 +02:00
parent dadfb986ce
commit 5bd11527e3
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/pci/als300.c
View File

@ -298,7 +298,8 @@ static int snd_als300_ac97(struct snd_als300 *chip)
.read = snd_als300_ac97_read, .read = snd_als300_ac97_read,
}; };
if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &bus)) < 0) err = snd_ac97_bus(chip->card, 0, &ops, NULL, &bus);
if (err < 0)
return err; return err;
memset(&ac97, 0, sizeof(ac97)); memset(&ac97, 0, sizeof(ac97));
@ -621,7 +622,8 @@ static int snd_als300_create(struct snd_card *card,
}; };
*rchip = NULL; *rchip = NULL;
if ((err = pci_enable_device(pci)) < 0) err = pci_enable_device(pci);
if (err < 0)
return err; return err;
if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28))) { if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28))) {
@ -643,7 +645,8 @@ static int snd_als300_create(struct snd_card *card,
chip->chip_type = chip_type; chip->chip_type = chip_type;
spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->reg_lock);
if ((err = pci_request_regions(pci, "ALS300")) < 0) { err = pci_request_regions(pci, "ALS300");
if (err < 0) {
kfree(chip); kfree(chip);
pci_disable_device(pci); pci_disable_device(pci);
return err; return err;
@ -673,14 +676,15 @@ static int snd_als300_create(struct snd_card *card,
return err; return err;
} }
if ((err = snd_als300_new_pcm(chip)) < 0) { err = snd_als300_new_pcm(chip);
if (err < 0) {
dev_err(card->dev, "Could not create PCM\n"); dev_err(card->dev, "Could not create PCM\n");
snd_als300_free(chip); snd_als300_free(chip);
return err; return err;
} }
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
chip, &ops)) < 0) { if (err < 0) {
snd_als300_free(chip); snd_als300_free(chip);
return err; return err;
} }
@ -741,7 +745,8 @@ static int snd_als300_probe(struct pci_dev *pci,
chip_type = pci_id->driver_data; chip_type = pci_id->driver_data;
if ((err = snd_als300_create(card, pci, chip_type, &chip)) < 0) { err = snd_als300_create(card, pci, chip_type, &chip);
if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }
@ -758,7 +763,8 @@ static int snd_als300_probe(struct pci_dev *pci,
sprintf(card->longname, "%s at 0x%lx irq %i", sprintf(card->longname, "%s at 0x%lx irq %i",
card->shortname, chip->port, chip->irq); card->shortname, chip->port, chip->irq);
if ((err = snd_card_register(card)) < 0) { err = snd_card_register(card);
if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }