Commit e3ded899 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: core: Fix assignment in if condition 

There are a few places doing assignments in if condition in ALSA core
code, 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-54-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e7daaeed

sound/core/hwdep.c

+4 −2
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ static int snd_hwdep_dsp_status(struct snd_hwdep *hw, 
		return -ENXIO;

	memset(&info, 0, sizeof(info));

	info.dsp_loaded = hw->dsp_loaded;

	if ((err = hw->ops.dsp_status(hw, &info)) < 0)

	err = hw->ops.dsp_status(hw, &info);

	if (err < 0)

		return err;

	if (copy_to_user(_info, &info, sizeof(info)))

		return -EFAULT;
@@ -500,7 +501,8 @@ static void __init snd_hwdep_proc_init(void) 
{

	struct snd_info_entry *entry;



	if ((entry = snd_info_create_module_entry(THIS_MODULE, "hwdep", NULL)) != NULL) {

	entry = snd_info_create_module_entry(THIS_MODULE, "hwdep", NULL);

	if (entry) {

		entry->c.text.read = snd_hwdep_proc_read;

		if (snd_info_register(entry) < 0) {

			snd_info_free_entry(entry);

sound/core/info_oss.c

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ int snd_oss_info_register(int dev, int num, char *string) 
		return -ENXIO;

	mutex_lock(&strings);

	if (string == NULL) {

		if ((x = snd_sndstat_strings[num][dev]) != NULL) {

		x = snd_sndstat_strings[num][dev];

		if (x) {

			kfree(x);

			x = NULL;

		}

sound/core/init.c

+8 −4
Original line number Diff line number Diff line
@@ -770,7 +770,8 @@ int snd_card_register(struct snd_card *card) 
		card->registered = true;

	}



	if ((err = snd_device_register_all(card)) < 0)

	err = snd_device_register_all(card);

	if (err < 0)

		return err;

	mutex_lock(&snd_card_mutex);

	if (snd_cards[card->number]) {
@@ -813,7 +814,8 @@ static void snd_card_info_read(struct snd_info_entry *entry, 


	for (idx = count = 0; idx < SNDRV_CARDS; idx++) {

		mutex_lock(&snd_card_mutex);

		if ((card = snd_cards[idx]) != NULL) {

		card = snd_cards[idx];

		if (card) {

			count++;

			snd_iprintf(buffer, "%2i [%-15s]: %s - %s\n",

					idx,
@@ -837,7 +839,8 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer) 


	for (idx = count = 0; idx < SNDRV_CARDS; idx++) {

		mutex_lock(&snd_card_mutex);

		if ((card = snd_cards[idx]) != NULL) {

		card = snd_cards[idx];

		if (card) {

			count++;

			snd_iprintf(buffer, "%s\n", card->longname);

		}
@@ -859,7 +862,8 @@ static void snd_card_module_info_read(struct snd_info_entry *entry, 


	for (idx = 0; idx < SNDRV_CARDS; idx++) {

		mutex_lock(&snd_card_mutex);

		if ((card = snd_cards[idx]) != NULL)

		card = snd_cards[idx];

		if (card)

			snd_iprintf(buffer, "%2i %s\n",

				    idx, card->module->name);

		mutex_unlock(&snd_card_mutex);

sound/core/sound.c

+2 −1
Original line number Diff line number Diff line
@@ -357,7 +357,8 @@ static void snd_minor_info_read(struct snd_info_entry *entry, struct snd_info_bu 


	mutex_lock(&sound_mutex);

	for (minor = 0; minor < SNDRV_OS_MINORS; ++minor) {

		if (!(mptr = snd_minors[minor]))

		mptr = snd_minors[minor];

		if (!mptr)

			continue;

		if (mptr->card >= 0) {

			if (mptr->device >= 0)

sound/core/sound_oss.c

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ static void snd_minor_info_oss_read(struct snd_info_entry *entry, 


	mutex_lock(&sound_oss_mutex);

	for (minor = 0; minor < SNDRV_OSS_MINORS; ++minor) {

		if (!(mptr = snd_oss_minors[minor]))

		mptr = snd_oss_minors[minor];

		if (!mptr)

			continue;

		if (mptr->card >= 0)

			snd_iprintf(buffer, "%3i: [%i-%2i]: %s\n", minor,