ALSA: poewrmac: Fix assignment in if condition
PPC powermac 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-65-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
Родитель
dd1fc3c585
Коммит
e73ad38871
|
|
@ -105,7 +105,10 @@ static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type,
|
|||
}
|
||||
|
||||
chip = input_get_drvdata(dev);
|
||||
if (! chip || (beep = chip->beep) == NULL)
|
||||
if (!chip)
|
||||
return -1;
|
||||
beep = chip->beep;
|
||||
if (!beep)
|
||||
return -1;
|
||||
|
||||
if (! hz) {
|
||||
|
|
|
|||
|
|
@ -84,7 +84,8 @@ static int daca_get_deemphasis(struct snd_kcontrol *kcontrol,
|
|||
{
|
||||
struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
|
||||
struct pmac_daca *mix;
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
ucontrol->value.integer.value[0] = mix->deemphasis ? 1 : 0;
|
||||
return 0;
|
||||
|
|
@ -97,7 +98,8 @@ static int daca_put_deemphasis(struct snd_kcontrol *kcontrol,
|
|||
struct pmac_daca *mix;
|
||||
int change;
|
||||
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
change = mix->deemphasis != ucontrol->value.integer.value[0];
|
||||
if (change) {
|
||||
|
|
@ -123,7 +125,8 @@ static int daca_get_volume(struct snd_kcontrol *kcontrol,
|
|||
{
|
||||
struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
|
||||
struct pmac_daca *mix;
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
ucontrol->value.integer.value[0] = mix->left_vol;
|
||||
ucontrol->value.integer.value[1] = mix->right_vol;
|
||||
|
|
@ -138,7 +141,8 @@ static int daca_put_volume(struct snd_kcontrol *kcontrol,
|
|||
unsigned int vol[2];
|
||||
int change;
|
||||
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
vol[0] = ucontrol->value.integer.value[0];
|
||||
vol[1] = ucontrol->value.integer.value[1];
|
||||
|
|
@ -162,7 +166,8 @@ static int daca_get_amp(struct snd_kcontrol *kcontrol,
|
|||
{
|
||||
struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
|
||||
struct pmac_daca *mix;
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
ucontrol->value.integer.value[0] = mix->amp_on ? 1 : 0;
|
||||
return 0;
|
||||
|
|
@ -175,7 +180,8 @@ static int daca_put_amp(struct snd_kcontrol *kcontrol,
|
|||
struct pmac_daca *mix;
|
||||
int change;
|
||||
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
change = mix->amp_on != ucontrol->value.integer.value[0];
|
||||
if (change) {
|
||||
|
|
@ -248,7 +254,8 @@ int snd_pmac_daca_init(struct snd_pmac *chip)
|
|||
mix->i2c.addr = DACA_I2C_ADDR;
|
||||
mix->i2c.init_client = daca_init_client;
|
||||
mix->i2c.name = "DACA";
|
||||
if ((err = snd_pmac_keywest_init(&mix->i2c)) < 0)
|
||||
err = snd_pmac_keywest_init(&mix->i2c);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
/*
|
||||
|
|
@ -257,7 +264,8 @@ int snd_pmac_daca_init(struct snd_pmac *chip)
|
|||
strcpy(chip->card->mixername, "PowerMac DACA");
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(daca_mixers); i++) {
|
||||
if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&daca_mixers[i], chip))) < 0)
|
||||
err = snd_ctl_add(chip->card, snd_ctl_new1(&daca_mixers[i], chip));
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -114,7 +114,8 @@ int snd_pmac_tumbler_post_init(void)
|
|||
if (!keywest_ctx || !keywest_ctx->client)
|
||||
return -ENXIO;
|
||||
|
||||
if ((err = keywest_ctx->init_client(keywest_ctx)) < 0) {
|
||||
err = keywest_ctx->init_client(keywest_ctx);
|
||||
if (err < 0) {
|
||||
snd_printk(KERN_ERR "tumbler: %i :cannot initialize the MCS\n", err);
|
||||
return err;
|
||||
}
|
||||
|
|
@ -136,7 +137,8 @@ int snd_pmac_keywest_init(struct pmac_keywest *i2c)
|
|||
|
||||
keywest_ctx = i2c;
|
||||
|
||||
if ((err = i2c_add_driver(&keywest_driver))) {
|
||||
err = i2c_add_driver(&keywest_driver);
|
||||
if (err) {
|
||||
snd_printk(KERN_ERR "cannot register keywest i2c driver\n");
|
||||
i2c_put_adapter(adap);
|
||||
return err;
|
||||
|
|
|
|||
|
|
@ -1160,7 +1160,8 @@ int snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
|
|||
chip->playback.stream = SNDRV_PCM_STREAM_PLAYBACK;
|
||||
chip->capture.stream = SNDRV_PCM_STREAM_CAPTURE;
|
||||
|
||||
if ((err = snd_pmac_detect(chip)) < 0)
|
||||
err = snd_pmac_detect(chip);
|
||||
if (err < 0)
|
||||
goto __error;
|
||||
|
||||
if (snd_pmac_dbdma_alloc(chip, &chip->playback.cmd, PMAC_MAX_FRAGS + 1) < 0 ||
|
||||
|
|
@ -1299,7 +1300,8 @@ int snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
|
|||
/* Reset dbdma channels */
|
||||
snd_pmac_dbdma_reset(chip);
|
||||
|
||||
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)
|
||||
goto __error;
|
||||
|
||||
*chip_return = chip;
|
||||
|
|
|
|||
|
|
@ -48,7 +48,8 @@ static int snd_pmac_probe(struct platform_device *devptr)
|
|||
if (err < 0)
|
||||
return err;
|
||||
|
||||
if ((err = snd_pmac_new(card, &chip)) < 0)
|
||||
err = snd_pmac_new(card, &chip);
|
||||
if (err < 0)
|
||||
goto __error;
|
||||
card->private_data = chip;
|
||||
|
||||
|
|
@ -58,7 +59,8 @@ static int snd_pmac_probe(struct platform_device *devptr)
|
|||
strcpy(card->shortname, "PowerMac Burgundy");
|
||||
sprintf(card->longname, "%s (Dev %d) Sub-frame %d",
|
||||
card->shortname, chip->device_id, chip->subframe);
|
||||
if ((err = snd_pmac_burgundy_init(chip)) < 0)
|
||||
err = snd_pmac_burgundy_init(chip);
|
||||
if (err < 0)
|
||||
goto __error;
|
||||
break;
|
||||
case PMAC_DACA:
|
||||
|
|
@ -66,7 +68,8 @@ static int snd_pmac_probe(struct platform_device *devptr)
|
|||
strcpy(card->shortname, "PowerMac DACA");
|
||||
sprintf(card->longname, "%s (Dev %d) Sub-frame %d",
|
||||
card->shortname, chip->device_id, chip->subframe);
|
||||
if ((err = snd_pmac_daca_init(chip)) < 0)
|
||||
err = snd_pmac_daca_init(chip);
|
||||
if (err < 0)
|
||||
goto __error;
|
||||
break;
|
||||
case PMAC_TUMBLER:
|
||||
|
|
@ -92,7 +95,8 @@ static int snd_pmac_probe(struct platform_device *devptr)
|
|||
name_ext = "";
|
||||
sprintf(card->longname, "%s%s Rev %d",
|
||||
card->shortname, name_ext, chip->revision);
|
||||
if ((err = snd_pmac_awacs_init(chip)) < 0)
|
||||
err = snd_pmac_awacs_init(chip);
|
||||
if (err < 0)
|
||||
goto __error;
|
||||
break;
|
||||
default:
|
||||
|
|
@ -101,14 +105,16 @@ static int snd_pmac_probe(struct platform_device *devptr)
|
|||
goto __error;
|
||||
}
|
||||
|
||||
if ((err = snd_pmac_pcm_new(chip)) < 0)
|
||||
err = snd_pmac_pcm_new(chip);
|
||||
if (err < 0)
|
||||
goto __error;
|
||||
|
||||
chip->initialized = 1;
|
||||
if (enable_beep)
|
||||
snd_pmac_attach_beep(chip);
|
||||
|
||||
if ((err = snd_card_register(card)) < 0)
|
||||
err = snd_card_register(card);
|
||||
if (err < 0)
|
||||
goto __error;
|
||||
|
||||
platform_set_drvdata(devptr, card);
|
||||
|
|
@ -162,7 +168,8 @@ static int __init alsa_card_pmac_init(void)
|
|||
{
|
||||
int err;
|
||||
|
||||
if ((err = platform_driver_register(&snd_pmac_driver)) < 0)
|
||||
err = platform_driver_register(&snd_pmac_driver);
|
||||
if (err < 0)
|
||||
return err;
|
||||
device = platform_device_register_simple(SND_PMAC_DRIVER, -1, NULL, 0);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -402,7 +402,8 @@ static int tumbler_get_drc_value(struct snd_kcontrol *kcontrol,
|
|||
{
|
||||
struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
|
||||
struct pmac_tumbler *mix;
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
ucontrol->value.integer.value[0] = mix->drc_range;
|
||||
return 0;
|
||||
|
|
@ -416,7 +417,8 @@ static int tumbler_put_drc_value(struct snd_kcontrol *kcontrol,
|
|||
unsigned int val;
|
||||
int change;
|
||||
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
val = ucontrol->value.integer.value[0];
|
||||
if (chip->model == PMAC_TUMBLER) {
|
||||
|
|
@ -442,7 +444,8 @@ static int tumbler_get_drc_switch(struct snd_kcontrol *kcontrol,
|
|||
{
|
||||
struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
|
||||
struct pmac_tumbler *mix;
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
ucontrol->value.integer.value[0] = mix->drc_enable;
|
||||
return 0;
|
||||
|
|
@ -455,7 +458,8 @@ static int tumbler_put_drc_switch(struct snd_kcontrol *kcontrol,
|
|||
struct pmac_tumbler *mix;
|
||||
int change;
|
||||
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
change = mix->drc_enable != ucontrol->value.integer.value[0];
|
||||
if (change) {
|
||||
|
|
@ -524,7 +528,8 @@ static int tumbler_get_mono(struct snd_kcontrol *kcontrol,
|
|||
struct tumbler_mono_vol *info = (struct tumbler_mono_vol *)kcontrol->private_value;
|
||||
struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
|
||||
struct pmac_tumbler *mix;
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
ucontrol->value.integer.value[0] = mix->mono_vol[info->index];
|
||||
return 0;
|
||||
|
|
@ -539,7 +544,8 @@ static int tumbler_put_mono(struct snd_kcontrol *kcontrol,
|
|||
unsigned int vol;
|
||||
int change;
|
||||
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
vol = ucontrol->value.integer.value[0];
|
||||
if (vol >= info->max)
|
||||
|
|
@ -669,7 +675,8 @@ static int snapper_get_mix(struct snd_kcontrol *kcontrol,
|
|||
int idx = (int)kcontrol->private_value;
|
||||
struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
|
||||
struct pmac_tumbler *mix;
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
ucontrol->value.integer.value[0] = mix->mix_vol[idx][0];
|
||||
ucontrol->value.integer.value[1] = mix->mix_vol[idx][1];
|
||||
|
|
@ -685,7 +692,8 @@ static int snapper_put_mix(struct snd_kcontrol *kcontrol,
|
|||
unsigned int vol[2];
|
||||
int change;
|
||||
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
vol[0] = ucontrol->value.integer.value[0];
|
||||
vol[1] = ucontrol->value.integer.value[1];
|
||||
|
|
@ -716,7 +724,8 @@ static int tumbler_get_mute_switch(struct snd_kcontrol *kcontrol,
|
|||
struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
|
||||
struct pmac_tumbler *mix;
|
||||
struct pmac_gpio *gp;
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
switch(kcontrol->private_value) {
|
||||
case TUMBLER_MUTE_HP:
|
||||
|
|
@ -745,7 +754,8 @@ static int tumbler_put_mute_switch(struct snd_kcontrol *kcontrol,
|
|||
if (chip->update_automute && chip->auto_mute)
|
||||
return 0; /* don't touch in the auto-mute mode */
|
||||
#endif
|
||||
if (! (mix = chip->mixer_data))
|
||||
mix = chip->mixer_data;
|
||||
if (!mix)
|
||||
return -ENODEV;
|
||||
switch(kcontrol->private_value) {
|
||||
case TUMBLER_MUTE_HP:
|
||||
|
|
@ -1361,7 +1371,8 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
|
|||
break;
|
||||
}
|
||||
}
|
||||
if ((err = tumbler_init(chip)) < 0)
|
||||
err = tumbler_init(chip);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
/* set up TAS */
|
||||
|
|
@ -1392,7 +1403,8 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
|
|||
chipname = "Snapper";
|
||||
}
|
||||
|
||||
if ((err = snd_pmac_keywest_init(&mix->i2c)) < 0)
|
||||
err = snd_pmac_keywest_init(&mix->i2c);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
/*
|
||||
|
|
@ -1402,28 +1414,34 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
|
|||
|
||||
if (chip->model == PMAC_TUMBLER) {
|
||||
for (i = 0; i < ARRAY_SIZE(tumbler_mixers); i++) {
|
||||
if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&tumbler_mixers[i], chip))) < 0)
|
||||
err = snd_ctl_add(chip->card, snd_ctl_new1(&tumbler_mixers[i], chip));
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < ARRAY_SIZE(snapper_mixers); i++) {
|
||||
if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&snapper_mixers[i], chip))) < 0)
|
||||
err = snd_ctl_add(chip->card, snd_ctl_new1(&snapper_mixers[i], chip));
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
}
|
||||
chip->master_sw_ctl = snd_ctl_new1(&tumbler_hp_sw, chip);
|
||||
if ((err = snd_ctl_add(chip->card, chip->master_sw_ctl)) < 0)
|
||||
err = snd_ctl_add(chip->card, chip->master_sw_ctl);
|
||||
if (err < 0)
|
||||
return err;
|
||||
chip->speaker_sw_ctl = snd_ctl_new1(&tumbler_speaker_sw, chip);
|
||||
if ((err = snd_ctl_add(chip->card, chip->speaker_sw_ctl)) < 0)
|
||||
err = snd_ctl_add(chip->card, chip->speaker_sw_ctl);
|
||||
if (err < 0)
|
||||
return err;
|
||||
if (mix->line_mute.addr != 0) {
|
||||
chip->lineout_sw_ctl = snd_ctl_new1(&tumbler_lineout_sw, chip);
|
||||
if ((err = snd_ctl_add(chip->card, chip->lineout_sw_ctl)) < 0)
|
||||
err = snd_ctl_add(chip->card, chip->lineout_sw_ctl);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
chip->drc_sw_ctl = snd_ctl_new1(&tumbler_drc_sw, chip);
|
||||
if ((err = snd_ctl_add(chip->card, chip->drc_sw_ctl)) < 0)
|
||||
err = snd_ctl_add(chip->card, chip->drc_sw_ctl);
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
/* set initial DRC range to 60% */
|
||||
|
|
@ -1446,9 +1464,11 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
|
|||
device_change_chip = chip;
|
||||
|
||||
#ifdef PMAC_SUPPORT_AUTOMUTE
|
||||
if ((mix->headphone_irq >=0 || mix->lineout_irq >= 0)
|
||||
&& (err = snd_pmac_add_automute(chip)) < 0)
|
||||
return err;
|
||||
if (mix->headphone_irq >= 0 || mix->lineout_irq >= 0) {
|
||||
err = snd_pmac_add_automute(chip);
|
||||
if (err < 0)
|
||||
return err;
|
||||
}
|
||||
chip->detect_headphone = tumbler_detect_headphone;
|
||||
chip->update_automute = tumbler_update_automute;
|
||||
tumbler_update_automute(chip, 0); /* update the status only */
|
||||
|
|
@ -1456,8 +1476,9 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
|
|||
/* activate headphone status interrupts */
|
||||
if (mix->headphone_irq >= 0) {
|
||||
unsigned char val;
|
||||
if ((err = request_irq(mix->headphone_irq, headphone_intr, 0,
|
||||
"Sound Headphone Detection", chip)) < 0)
|
||||
err = request_irq(mix->headphone_irq, headphone_intr, 0,
|
||||
"Sound Headphone Detection", chip);
|
||||
if (err < 0)
|
||||
return 0;
|
||||
/* activate headphone status interrupts */
|
||||
val = do_gpio_read(&mix->hp_detect);
|
||||
|
|
@ -1465,8 +1486,9 @@ int snd_pmac_tumbler_init(struct snd_pmac *chip)
|
|||
}
|
||||
if (mix->lineout_irq >= 0) {
|
||||
unsigned char val;
|
||||
if ((err = request_irq(mix->lineout_irq, headphone_intr, 0,
|
||||
"Sound Lineout Detection", chip)) < 0)
|
||||
err = request_irq(mix->lineout_irq, headphone_intr, 0,
|
||||
"Sound Lineout Detection", chip);
|
||||
if (err < 0)
|
||||
return 0;
|
||||
/* activate headphone status interrupts */
|
||||
val = do_gpio_read(&mix->line_detect);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче