Skip to content

L
linux
Commit 3a5f3dd3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

ALSA: intel8x0: Fix assignment in if condition 

PCI intel8x0 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-29-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 68f441ab
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 28 deletions
sound/pci/intel8x0.c
View file @ 3a5f3dd3
...@@ -538,7 +538,8 @@ static unsigned short snd_intel8x0_codec_read(struct snd_ac97 *ac97, ...@@ -538,7 +538,8 @@ static unsigned short snd_intel8x0_codec_read(struct snd_ac97 *ac97,
res = 0xffff; res = 0xffff;
} else { } else {
res = iagetword(chip, reg + ac97->num * 0x80); res = iagetword(chip, reg + ac97->num * 0x80);
if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) & ICH_RCS) { tmp = igetdword(chip, ICHREG(GLOB_STA));
if (tmp & ICH_RCS) {
/* reset RCS and preserve other R/WC bits */ /* reset RCS and preserve other R/WC bits */
iputdword(chip, ICHREG(GLOB_STA), tmp & iputdword(chip, ICHREG(GLOB_STA), tmp &
~(chip->codec_ready_bits | ICH_GSCI)); ~(chip->codec_ready_bits | ICH_GSCI));
...@@ -559,7 +560,8 @@ static void snd_intel8x0_codec_read_test(struct intel8x0 *chip, ...@@ -559,7 +560,8 @@ static void snd_intel8x0_codec_read_test(struct intel8x0 *chip,
if (snd_intel8x0_codec_semaphore(chip, codec) >= 0) { if (snd_intel8x0_codec_semaphore(chip, codec) >= 0) {
iagetword(chip, codec * 0x80); iagetword(chip, codec * 0x80);
if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) & ICH_RCS) { tmp = igetdword(chip, ICHREG(GLOB_STA));
if (tmp & ICH_RCS) {
/* reset RCS and preserve other R/WC bits */ /* reset RCS and preserve other R/WC bits */
iputdword(chip, ICHREG(GLOB_STA), tmp & iputdword(chip, ICHREG(GLOB_STA), tmp &
~(chip->codec_ready_bits | ICH_GSCI)); ~(chip->codec_ready_bits | ICH_GSCI));
...@@ -1105,7 +1107,8 @@ static int snd_intel8x0_pcm_open(struct snd_pcm_substream *substream, struct ich ...@@ -1105,7 +1107,8 @@ static int snd_intel8x0_pcm_open(struct snd_pcm_substream *substream, struct ich
runtime->hw.buffer_bytes_max = 64*1024; runtime->hw.buffer_bytes_max = 64*1024;
runtime->hw.period_bytes_max = 64*1024; runtime->hw.period_bytes_max = 64*1024;
} }
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;
runtime->private_data = ichdev; runtime->private_data = ichdev;
return 0; return 0;
...@@ -2190,7 +2193,8 @@ static int snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, ...@@ -2190,7 +2193,8 @@ static int snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
udelay(1); udelay(1);
} }
} }
if ((err = snd_ac97_bus(chip->card, 0, ops, chip, &pbus)) < 0) err = snd_ac97_bus(chip->card, 0, ops, chip, &pbus);
if (err < 0)
goto __err; goto __err;
pbus->private_free = snd_intel8x0_mixer_free_ac97_bus; pbus->private_free = snd_intel8x0_mixer_free_ac97_bus;
if (ac97_clock >= 8000 && ac97_clock <= 48000) if (ac97_clock >= 8000 && ac97_clock <= 48000)
...@@ -2206,7 +2210,8 @@ static int snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, ...@@ -2206,7 +2210,8 @@ static int snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
ac97.pci = chip->pci; ac97.pci = chip->pci;
for (i = 0; i < codecs; i++) { for (i = 0; i < codecs; i++) {
ac97.num = i; ac97.num = i;
if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97[i])) < 0) { err = snd_ac97_mixer(pbus, &ac97, &chip->ac97[i]);
if (err < 0) {
if (err != -EACCES) if (err != -EACCES)
dev_err(chip->card->dev, dev_err(chip->card->dev,
"Unable to initialize codec #%d\n", i); "Unable to initialize codec #%d\n", i);
...@@ -2491,11 +2496,13 @@ static int snd_intel8x0_chip_init(struct intel8x0 *chip, int probing) ...@@ -2491,11 +2496,13 @@ static int snd_intel8x0_chip_init(struct intel8x0 *chip, int probing)
int err; int err;
if (chip->device_type != DEVICE_ALI) { if (chip->device_type != DEVICE_ALI) {
if ((err = snd_intel8x0_ich_chip_init(chip, probing)) < 0) err = snd_intel8x0_ich_chip_init(chip, probing);
if (err < 0)
return err; return err;
iagetword(chip, 0); /* clear semaphore flag */ iagetword(chip, 0); /* clear semaphore flag */
} else { } else {
if ((err = snd_intel8x0_ali_chip_init(chip, probing)) < 0) err = snd_intel8x0_ali_chip_init(chip, probing);
if (err < 0)
return err; return err;
} }
...@@ -2918,7 +2925,8 @@ static int snd_intel8x0_create(struct snd_card *card, ...@@ -2918,7 +2925,8 @@ static int snd_intel8x0_create(struct snd_card *card,
*r_intel8x0 = NULL; *r_intel8x0 = NULL;
if ((err = pci_enable_device(pci)) < 0) err = pci_enable_device(pci);
if (err < 0)
return err; return err;
chip = kzalloc(sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
...@@ -2950,7 +2958,8 @@ static int snd_intel8x0_create(struct snd_card *card, ...@@ -2950,7 +2958,8 @@ static int snd_intel8x0_create(struct snd_card *card,
pci->device == PCI_DEVICE_ID_INTEL_440MX) pci->device == PCI_DEVICE_ID_INTEL_440MX)
chip->fix_nocache = 1; /* enable workaround */ chip->fix_nocache = 1; /* enable workaround */
if ((err = pci_request_regions(pci, card->shortname)) < 0) { err = pci_request_regions(pci, card->shortname);
if (err < 0) {
kfree(chip); kfree(chip);
pci_disable_device(pci); pci_disable_device(pci);
return err; return err;
...@@ -3064,7 +3073,8 @@ static int snd_intel8x0_create(struct snd_card *card, ...@@ -3064,7 +3073,8 @@ static int snd_intel8x0_create(struct snd_card *card,
for (i = 0; i < chip->max_codecs; i++) for (i = 0; i < chip->max_codecs; i++)
chip->codec_isr_bits |= chip->codec_bit[i]; chip->codec_isr_bits |= chip->codec_bit[i];
if ((err = snd_intel8x0_chip_init(chip, 1)) < 0) { err = snd_intel8x0_chip_init(chip, 1);
if (err < 0) {
snd_intel8x0_free(chip); snd_intel8x0_free(chip);
return err; return err;
} }
...@@ -3079,7 +3089,8 @@ static int snd_intel8x0_create(struct snd_card *card, ...@@ -3079,7 +3089,8 @@ static int snd_intel8x0_create(struct snd_card *card,
chip->irq = pci->irq; chip->irq = pci->irq;
card->sync_irq = chip->irq; card->sync_irq = chip->irq;
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
if (err < 0) {
snd_intel8x0_free(chip); snd_intel8x0_free(chip);
return err; return err;
} }
...@@ -3186,18 +3197,20 @@ static int snd_intel8x0_probe(struct pci_dev *pci, ...@@ -3186,18 +3197,20 @@ static int snd_intel8x0_probe(struct pci_dev *pci,
buggy_irq = 0; buggy_irq = 0;
} }
if ((err = snd_intel8x0_create(card, pci, pci_id->driver_data, err = snd_intel8x0_create(card, pci, pci_id->driver_data, &chip);
&chip)) < 0) { if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }
card->private_data = chip; card->private_data = chip;
if ((err = snd_intel8x0_mixer(chip, ac97_clock, ac97_quirk)) < 0) { err = snd_intel8x0_mixer(chip, ac97_clock, ac97_quirk);
if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }
if ((err = snd_intel8x0_pcm(chip)) < 0) { err = snd_intel8x0_pcm(chip);
if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }
...@@ -3217,7 +3230,8 @@ static int snd_intel8x0_probe(struct pci_dev *pci, ...@@ -3217,7 +3230,8 @@ static int snd_intel8x0_probe(struct pci_dev *pci,
} }
} }
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;
} }
......
sound/pci/intel8x0m.c
View file @ 3a5f3dd3
...@@ -342,7 +342,8 @@ static unsigned short snd_intel8x0m_codec_read(struct snd_ac97 *ac97, ...@@ -342,7 +342,8 @@ static unsigned short snd_intel8x0m_codec_read(struct snd_ac97 *ac97,
res = 0xffff; res = 0xffff;
} else { } else {
res = iagetword(chip, reg + ac97->num * 0x80); res = iagetword(chip, reg + ac97->num * 0x80);
if ((tmp = igetdword(chip, ICHREG(GLOB_STA))) & ICH_RCS) { tmp = igetdword(chip, ICHREG(GLOB_STA));
if (tmp & ICH_RCS) {
/* reset RCS and preserve other R/WC bits */ /* reset RCS and preserve other R/WC bits */
iputdword(chip, ICHREG(GLOB_STA), iputdword(chip, ICHREG(GLOB_STA),
tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI)); tmp & ~(ICH_SRI|ICH_PRI|ICH_TRI|ICH_GSCI));
...@@ -800,7 +801,8 @@ static int snd_intel8x0m_mixer(struct intel8x0m *chip, int ac97_clock) ...@@ -800,7 +801,8 @@ static int snd_intel8x0m_mixer(struct intel8x0m *chip, int ac97_clock)
glob_sta = igetdword(chip, ICHREG(GLOB_STA)); glob_sta = igetdword(chip, ICHREG(GLOB_STA));
if ((err = snd_ac97_bus(chip->card, 0, &ops, chip, &pbus)) < 0) err = snd_ac97_bus(chip->card, 0, &ops, chip, &pbus);
if (err < 0)
goto __err; goto __err;
pbus->private_free = snd_intel8x0m_mixer_free_ac97_bus; pbus->private_free = snd_intel8x0m_mixer_free_ac97_bus;
if (ac97_clock >= 8000 && ac97_clock <= 48000) if (ac97_clock >= 8000 && ac97_clock <= 48000)
...@@ -809,7 +811,8 @@ static int snd_intel8x0m_mixer(struct intel8x0m *chip, int ac97_clock) ...@@ -809,7 +811,8 @@ static int snd_intel8x0m_mixer(struct intel8x0m *chip, int ac97_clock)
ac97.pci = chip->pci; ac97.pci = chip->pci;
ac97.num = glob_sta & ICH_SCR ? 1 : 0; ac97.num = glob_sta & ICH_SCR ? 1 : 0;
if ((err = snd_ac97_mixer(pbus, &ac97, &x97)) < 0) { err = snd_ac97_mixer(pbus, &ac97, &x97);
if (err < 0) {
dev_err(chip->card->dev, dev_err(chip->card->dev,
"Unable to initialize codec #%d\n", ac97.num); "Unable to initialize codec #%d\n", ac97.num);
if (ac97.num == 0) if (ac97.num == 0)
...@@ -927,7 +930,8 @@ static int snd_intel8x0m_chip_init(struct intel8x0m *chip, int probing) ...@@ -927,7 +930,8 @@ static int snd_intel8x0m_chip_init(struct intel8x0m *chip, int probing)
unsigned int i; unsigned int i;
int err; int err;
if ((err = snd_intel8x0m_ich_chip_init(chip, probing)) < 0) err = snd_intel8x0m_ich_chip_init(chip, probing);
if (err < 0)
return err; return err;
iagetword(chip, 0); /* clear semaphore flag */ iagetword(chip, 0); /* clear semaphore flag */
...@@ -1075,7 +1079,8 @@ static int snd_intel8x0m_create(struct snd_card *card, ...@@ -1075,7 +1079,8 @@ static int snd_intel8x0m_create(struct snd_card *card,
*r_intel8x0m = NULL; *r_intel8x0m = NULL;
if ((err = pci_enable_device(pci)) < 0) err = pci_enable_device(pci);
if (err < 0)
return err; return err;
chip = kzalloc(sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
...@@ -1089,7 +1094,8 @@ static int snd_intel8x0m_create(struct snd_card *card, ...@@ -1089,7 +1094,8 @@ static int snd_intel8x0m_create(struct snd_card *card,
chip->pci = pci; chip->pci = pci;
chip->irq = -1; chip->irq = -1;
if ((err = pci_request_regions(pci, card->shortname)) < 0) { err = pci_request_regions(pci, card->shortname);
if (err < 0) {
kfree(chip); kfree(chip);
pci_disable_device(pci); pci_disable_device(pci);
return err; return err;
...@@ -1167,7 +1173,8 @@ static int snd_intel8x0m_create(struct snd_card *card, ...@@ -1167,7 +1173,8 @@ static int snd_intel8x0m_create(struct snd_card *card,
pci_set_master(pci); pci_set_master(pci);
if ((err = snd_intel8x0m_chip_init(chip, 1)) < 0) { err = snd_intel8x0m_chip_init(chip, 1);
if (err < 0) {
snd_intel8x0m_free(chip); snd_intel8x0m_free(chip);
return err; return err;
} }
...@@ -1181,7 +1188,8 @@ static int snd_intel8x0m_create(struct snd_card *card, ...@@ -1181,7 +1188,8 @@ static int snd_intel8x0m_create(struct snd_card *card,
chip->irq = pci->irq; chip->irq = pci->irq;
card->sync_irq = chip->irq; card->sync_irq = chip->irq;
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
if (err < 0) {
snd_intel8x0m_free(chip); snd_intel8x0m_free(chip);
return err; return err;
} }
...@@ -1238,17 +1246,20 @@ static int snd_intel8x0m_probe(struct pci_dev *pci, ...@@ -1238,17 +1246,20 @@ static int snd_intel8x0m_probe(struct pci_dev *pci,
} }
strcat(card->shortname," Modem"); strcat(card->shortname," Modem");
if ((err = snd_intel8x0m_create(card, pci, pci_id->driver_data, &chip)) < 0) { err = snd_intel8x0m_create(card, pci, pci_id->driver_data, &chip);
if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }
card->private_data = chip; card->private_data = chip;
if ((err = snd_intel8x0m_mixer(chip, ac97_clock)) < 0) { err = snd_intel8x0m_mixer(chip, ac97_clock);
if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }
if ((err = snd_intel8x0m_pcm(chip)) < 0) { err = snd_intel8x0m_pcm(chip);
if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }
...@@ -1258,7 +1269,8 @@ static int snd_intel8x0m_probe(struct pci_dev *pci, ...@@ -1258,7 +1269,8 @@ static int snd_intel8x0m_probe(struct pci_dev *pci,
sprintf(card->longname, "%s at irq %i", sprintf(card->longname, "%s at irq %i",
card->shortname, chip->irq); card->shortname, 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;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7