Changeset 703 for GPL/trunk/alsa-kernel/pci/es1968.c

Timestamp:

Sep 26, 2021, 6:18:40 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/es1968.c (modified) (14 diffs)

GPL/trunk/alsa-kernel/pci/es1968.c

@@ -1616 +1616 @@
 
         /* get mixbuffer */
-        if ((es->mixbuf = snd_es1968_new_memory(chip, ESM_MIXBUF_SIZE)) == NULL) {
+        es->mixbuf = snd_es1968_new_memory(chip, ESM_MIXBUF_SIZE);
+        if (!es->mixbuf) {
                 snd_es1968_free_apu_pair(chip, apu1);
                 snd_es1968_free_apu_pair(chip, apu2);
@@ -1715 +1716 @@
 
         /* search 2 APUs (although one apu is enough) */
-        if ((apu = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_PLAY)) < 0) {
+        apu = snd_es1968_alloc_apu_pair(chip, ESM_APU_PCM_PLAY);
+        if (apu < 0) {
                 dev_err(chip->card->dev, "Hmm, cannot find empty APU pair!?\n");
                 return;
         }
-        if ((memory = snd_es1968_new_memory(chip, CLOCK_MEASURE_BUFSIZE)) == NULL) {
+        memory = snd_es1968_new_memory(chip, CLOCK_MEASURE_BUFSIZE);
+        if (!memory) {
                 dev_warn(chip->card->dev,
                          "cannot allocate dma buffer - using default clock %d\n",
@@ -1828 +1831 @@
 
         /* get DMA buffer */
-        if ((err = snd_es1968_init_dmabuf(chip)) < 0)
+        err = snd_es1968_init_dmabuf(chip);
+        if (err < 0)
                 return err;
 
@@ -1837 +1841 @@
         wave_set_register(chip, 0x01FF, chip->dma.addr >> 12);
 
-        if ((err = snd_pcm_new(chip->card, "ESS Maestro", device,
-                               chip->playback_streams,
-                               chip->capture_streams, &pcm)) < 0)
+        err = snd_pcm_new(chip->card, "ESS Maestro", device,
+                          chip->playback_streams,
+                          chip->capture_streams, &pcm);
+        if (err < 0)
                 return err;
 
@@ -1990 +1995 @@
         u32 event;
 
-        if (!(event = inb(chip->io_port + 0x1A)))
+        event = inb(chip->io_port + 0x1A);
+        if (!event)
                 return IRQ_NONE;
 
@@ -2045 +2051 @@
         };
 
-        if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
+        err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus);
+        if (err < 0)
                 return err;
         pbus->no_vra = 1; /* ES1968 doesn't need VRA */
@@ -2051 +2058 @@
         memset(&ac97, 0, sizeof(ac97));
         ac97.private_data = chip;
-        if ((err = snd_ac97_mixer(pbus, &ac97, &chip->ac97)) < 0)
+        err = snd_ac97_mixer(pbus, &ac97, &chip->ac97);
+        if (err < 0)
                 return err;
 
@@ -2698 +2706 @@
 
         /* enable PCI device */
-        if ((err = pci_enable_device(pci)) < 0)
+        err = pci_enable_device(pci);
+        if (err < 0)
                 return err;
         /* check, if we can restrict PCI DMA transfers to 28 bits */
@@ -2729 +2738 @@
         chip->capture_streams = capt_streams;
 
-        if ((err = pci_request_regions(pci, "ESS Maestro")) < 0) {
+        err = pci_request_regions(pci, "ESS Maestro");
+        if (err < 0) {
                 kfree(chip);
                 pci_disable_device(pci);
@@ -2776 +2786 @@
         snd_es1968_chip_init(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) {
                 snd_es1968_free(chip);
                 return err;
@@ -2841 +2852 @@
         if (total_bufsize[dev] > 4096)
                 total_bufsize[dev] = 4096;
-        if ((err = snd_es1968_create(card, pci,
-                                     total_bufsize[dev] * 1024, /* in bytes */
-                                     pcm_substreams_p[dev], 
-                                     pcm_substreams_c[dev],
-                                     pci_id->driver_data,
-                                     use_pm[dev],
-                                     radio_nr[dev],
-                                     &chip)) < 0) {
+        err = snd_es1968_create(card, pci,
+                                total_bufsize[dev] * 1024, /* in bytes */
+                                pcm_substreams_p[dev],
+                                pcm_substreams_c[dev],
+                                pci_id->driver_data,
+                                use_pm[dev],
+                                radio_nr[dev],
+                                &chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -2869 +2881 @@
         }
 
-        if ((err = snd_es1968_pcm(chip, 0)) < 0) {
+        err = snd_es1968_pcm(chip, 0);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
         }
 
-        if ((err = snd_es1968_mixer(chip)) < 0) {
+        err = snd_es1968_mixer(chip);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -2892 +2906 @@
         }
         if (enable_mpu[dev]) {
-                if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                                               chip->io_port + ESM_MPU401_PORT,
-                                               MPU401_INFO_INTEGRATED |
-                                               MPU401_INFO_IRQ_HOOK,
-                                               -1, &chip->rmidi)) < 0) {
+                err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
+                                          chip->io_port + ESM_MPU401_PORT,
+                                          MPU401_INFO_INTEGRATED |
+                                          MPU401_INFO_IRQ_HOOK,
+                                          -1, &chip->rmidi);
+                if (err < 0)
                         dev_warn(card->dev, "skipping MPU-401 MIDI support..\n");
-                }
         }
 
@@ -2919 +2933 @@
                 card->shortname, chip->io_port, chip->irq);
 
-        if ((err = snd_card_register(card)) < 0) {
+        err = snd_card_register(card);
+        if (err < 0) {
                 snd_card_free(card);
                 return err;