Commit 234e9280 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: korg1212: Fix assignment in if condition 

PCI Korg1212 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-44-tiwai@suse.de


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

sound/pci/korg1212/korg1212.c

+16 −8
Original line number Diff line number Diff line
@@ -1527,7 +1527,8 @@ static int snd_korg1212_hw_params(struct snd_pcm_substream *substream, 
	        return 0;

	}



        if ((err = snd_korg1212_SetRate(korg1212, params_rate(params))) < 0) {

	err = snd_korg1212_SetRate(korg1212, params_rate(params));

	if (err < 0) {

                spin_unlock_irqrestore(&korg1212->lock, flags);

                return err;

        }
@@ -2159,7 +2160,8 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, 
        };



        * rchip = NULL;

        if ((err = pci_enable_device(pci)) < 0)

	err = pci_enable_device(pci);

	if (err < 0)

                return err;



        korg1212 = kzalloc(sizeof(*korg1212), GFP_KERNEL);
@@ -2196,7 +2198,8 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, 
        for (i=0; i<kAudioChannels; i++)

                korg1212->volumePhase[i] = 0;



	if ((err = pci_request_regions(pci, "korg1212")) < 0) {

	err = pci_request_regions(pci, "korg1212");

	if (err < 0) {

		kfree(korg1212);

		pci_disable_device(pci);

		return err;
@@ -2220,7 +2223,8 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, 
		   korg1212->iomem2, iomem2_size,

		   stateName[korg1212->cardState]);



        if ((korg1212->iobase = ioremap(korg1212->iomem, iomem_size)) == NULL) {

	korg1212->iobase = ioremap(korg1212->iomem, iomem_size);

	if (!korg1212->iobase) {

		snd_printk(KERN_ERR "korg1212: unable to remap memory region 0x%lx-0x%lx\n", korg1212->iomem,

                           korg1212->iomem + iomem_size - 1);

                snd_korg1212_free(korg1212);
@@ -2360,7 +2364,8 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, 
	if (rc)

		K1212_DEBUG_PRINTK("K1212_DEBUG: Reboot Card - RC = %d [%s]\n", rc, stateName[korg1212->cardState]);



        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, korg1212, &ops)) < 0) {

	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, korg1212, &ops);

	if (err < 0) {

                snd_korg1212_free(korg1212);

                return err;

        }
@@ -2385,7 +2390,8 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci, 
               korg1212->RoutingTablePhy, LowerWordSwap(korg1212->RoutingTablePhy),

               korg1212->AdatTimeCodePhy, LowerWordSwap(korg1212->AdatTimeCodePhy));



        if ((err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm)) < 0)

	err = snd_pcm_new(korg1212->card, "korg1212", 0, 1, 1, &korg1212->pcm);

	if (err < 0)

                return err;



	korg1212->pcm->private_data = korg1212;
@@ -2436,7 +2442,8 @@ snd_korg1212_probe(struct pci_dev *pci, 
	if (err < 0)

		return err;



        if ((err = snd_korg1212_create(card, pci, &korg1212)) < 0) {

	err = snd_korg1212_create(card, pci, &korg1212);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}
@@ -2448,7 +2455,8 @@ snd_korg1212_probe(struct pci_dev *pci, 


        K1212_DEBUG_PRINTK("K1212_DEBUG: %s\n", card->longname);



	if ((err = snd_card_register(card)) < 0) {

	err = snd_card_register(card);

	if (err < 0) {

		snd_card_free(card);

		return err;

	}