mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 13:53:33 +00:00
Code Issues Releases Wiki Activity

ALSA: opl3: Fix assignment in if condition

Browse source 
OPL3 helper 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-62-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2021-06-08 16:05:35 +02:00
parent ed1567c106
commit 9c78e80319
3 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
sound/drivers/opl3/opl3_lib.c
View file

@ -243,7 +243,8 @@ static int snd_opl3_timer1_init(struct snd_opl3 * opl3, int timer_no)
tid.card = opl3->card->number; tid.card = opl3->card->number;
tid.device = timer_no; tid.device = timer_no;
tid.subdevice = 0; tid.subdevice = 0;
if ((err = snd_timer_new(opl3->card, "AdLib timer #1", &tid, &timer)) >= 0) { err = snd_timer_new(opl3->card, "AdLib timer #1", &tid, &timer);
if (err >= 0) {
strcpy(timer->name, "AdLib timer #1"); strcpy(timer->name, "AdLib timer #1");
timer->private_data = opl3; timer->private_data = opl3;
timer->hw = snd_opl3_timer1; timer->hw = snd_opl3_timer1;
@ -263,7 +264,8 @@ static int snd_opl3_timer2_init(struct snd_opl3 * opl3, int timer_no)
tid.card = opl3->card->number; tid.card = opl3->card->number;
tid.device = timer_no; tid.device = timer_no;
tid.subdevice = 0; tid.subdevice = 0;
if ((err = snd_timer_new(opl3->card, "AdLib timer #2", &tid, &timer)) >= 0) { err = snd_timer_new(opl3->card, "AdLib timer #2", &tid, &timer);
if (err >= 0) {
strcpy(timer->name, "AdLib timer #2"); strcpy(timer->name, "AdLib timer #2");
timer->private_data = opl3; timer->private_data = opl3;
timer->hw = snd_opl3_timer2; timer->hw = snd_opl3_timer2;
@ -348,7 +350,8 @@ int snd_opl3_new(struct snd_card *card,
spin_lock_init(&opl3->reg_lock); spin_lock_init(&opl3->reg_lock);
spin_lock_init(&opl3->timer_lock); spin_lock_init(&opl3->timer_lock);
if ((err = snd_device_new(card, SNDRV_DEV_CODEC, opl3, &ops)) < 0) { err = snd_device_new(card, SNDRV_DEV_CODEC, opl3, &ops);
if (err < 0) {
snd_opl3_free(opl3); snd_opl3_free(opl3);
return err; return err;
} }
@ -396,19 +399,23 @@ int snd_opl3_create(struct snd_card *card,
int err; int err;
*ropl3 = NULL; *ropl3 = NULL;
if ((err = snd_opl3_new(card, hardware, &opl3)) < 0) err = snd_opl3_new(card, hardware, &opl3);
if (err < 0)
return err; return err;
if (! integrated) { if (! integrated) {
if ((opl3->res_l_port = request_region(l_port, 2, "OPL2/3 (left)")) == NULL) { opl3->res_l_port = request_region(l_port, 2, "OPL2/3 (left)");
if (!opl3->res_l_port) {
snd_printk(KERN_ERR "opl3: can't grab left port 0x%lx\n", l_port); snd_printk(KERN_ERR "opl3: can't grab left port 0x%lx\n", l_port);
snd_device_free(card, opl3); snd_device_free(card, opl3);
return -EBUSY; return -EBUSY;
} }
if (r_port != 0 && if (r_port != 0) {
(opl3->res_r_port = request_region(r_port, 2, "OPL2/3 (right)")) == NULL) { opl3->res_r_port = request_region(r_port, 2, "OPL2/3 (right)");
snd_printk(KERN_ERR "opl3: can't grab right port 0x%lx\n", r_port); if (!opl3->res_r_port) {
snd_device_free(card, opl3); snd_printk(KERN_ERR "opl3: can't grab right port 0x%lx\n", r_port);
return -EBUSY; snd_device_free(card, opl3);
return -EBUSY;
}
} }
} }
opl3->l_port = l_port; opl3->l_port = l_port;
@ -423,7 +430,8 @@ int snd_opl3_create(struct snd_card *card,
break; break;
default: default:
opl3->command = &snd_opl2_command; opl3->command = &snd_opl2_command;
if ((err = snd_opl3_detect(opl3)) < 0) { err = snd_opl3_detect(opl3);
if (err < 0) {
snd_printd("OPL2/3 chip not detected at 0x%lx/0x%lx\n", snd_printd("OPL2/3 chip not detected at 0x%lx/0x%lx\n",
opl3->l_port, opl3->r_port); opl3->l_port, opl3->r_port);
snd_device_free(card, opl3); snd_device_free(card, opl3);
@ -449,11 +457,14 @@ int snd_opl3_timer_new(struct snd_opl3 * opl3, int timer1_dev, int timer2_dev)
{ {
int err; int err;
if (timer1_dev >= 0) if (timer1_dev >= 0) {
if ((err = snd_opl3_timer1_init(opl3, timer1_dev)) < 0) err = snd_opl3_timer1_init(opl3, timer1_dev);
if (err < 0)
return err; return err;
}
if (timer2_dev >= 0) { if (timer2_dev >= 0) {
if ((err = snd_opl3_timer2_init(opl3, timer2_dev)) < 0) { err = snd_opl3_timer2_init(opl3, timer2_dev);
if (err < 0) {
snd_device_free(opl3->card, opl3->timer1); snd_device_free(opl3->card, opl3->timer1);
opl3->timer1 = NULL; opl3->timer1 = NULL;
return err; return err;
@ -477,7 +488,8 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3,
/* create hardware dependent device (direct FM) */ /* create hardware dependent device (direct FM) */
if ((err = snd_hwdep_new(card, "OPL2/OPL3", device, &hw)) < 0) { err = snd_hwdep_new(card, "OPL2/OPL3", device, &hw);
if (err < 0) {
snd_device_free(card, opl3); snd_device_free(card, opl3);
return err; return err;
} }

6
sound/drivers/opl3/opl3_oss.c
View file

@ -136,7 +136,8 @@ static int snd_opl3_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure)
if (snd_BUG_ON(!arg)) if (snd_BUG_ON(!arg))
return -ENXIO; return -ENXIO;
if ((err = snd_opl3_synth_setup(opl3)) < 0) err = snd_opl3_synth_setup(opl3);
if (err < 0)
return err; return err;
/* fill the argument data */ /* fill the argument data */
@ -144,7 +145,8 @@ static int snd_opl3_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure)
arg->addr.client = opl3->oss_chset->client; arg->addr.client = opl3->oss_chset->client;
arg->addr.port = opl3->oss_chset->port; arg->addr.port = opl3->oss_chset->port;
if ((err = snd_opl3_synth_use_inc(opl3)) < 0) err = snd_opl3_synth_use_inc(opl3);
if (err < 0)
return err; return err;
opl3->synth_mode = SNDRV_OPL3_MODE_SYNTH; opl3->synth_mode = SNDRV_OPL3_MODE_SYNTH;

9
sound/drivers/opl3/opl3_seq.c
View file

@ -92,7 +92,8 @@ static int snd_opl3_synth_use(void *private_data, struct snd_seq_port_subscribe
struct snd_opl3 *opl3 = private_data; struct snd_opl3 *opl3 = private_data;
int err; int err;
if ((err = snd_opl3_synth_setup(opl3)) < 0) err = snd_opl3_synth_setup(opl3);
if (err < 0)
return err; return err;
if (use_internal_drums) { if (use_internal_drums) {
@ -107,7 +108,8 @@ static int snd_opl3_synth_use(void *private_data, struct snd_seq_port_subscribe
} }
if (info->sender.client != SNDRV_SEQ_CLIENT_SYSTEM) { if (info->sender.client != SNDRV_SEQ_CLIENT_SYSTEM) {
if ((err = snd_opl3_synth_use_inc(opl3)) < 0) err = snd_opl3_synth_use_inc(opl3);
if (err < 0)
return err; return err;
} }
opl3->synth_mode = SNDRV_OPL3_MODE_SEQ; opl3->synth_mode = SNDRV_OPL3_MODE_SEQ;
@ -227,7 +229,8 @@ static int snd_opl3_seq_probe(struct device *_dev)
if (client < 0) if (client < 0)
return client; return client;
if ((err = snd_opl3_synth_create_port(opl3)) < 0) { err = snd_opl3_synth_create_port(opl3);
if (err < 0) {
snd_seq_delete_kernel_client(client); snd_seq_delete_kernel_client(client);
opl3->seq_client = -1; opl3->seq_client = -1;
return err; return err;