Changeset 697 for GPL/branches/uniaud32-next/alsa-kernel/drivers/serial-u16550.c

Timestamp:

Sep 26, 2021, 10:39:09 AM (4 years ago)

Author:

Paul Smedley

Message:

Update linux code to 5.14.17 level

File:

• GPL/branches/uniaud32-next/alsa-kernel/drivers/serial-u16550.c (modified) (6 diffs)

GPL/branches/uniaud32-next/alsa-kernel/drivers/serial-u16550.c

@@ -784 +784 @@
 
 
-        if ((uart = kzalloc(sizeof(*uart), GFP_KERNEL)) == NULL)
+        uart = kzalloc(sizeof(*uart), GFP_KERNEL);
+        if (!uart)
                 return -ENOMEM;
         uart->adaptor = adaptor;
@@ -793 +794 @@
         uart->drop_on_full = droponfull;
 
-        if ((err = snd_uart16550_detect(uart)) <= 0) {
+        err = snd_uart16550_detect(uart);
+        if (err <= 0) {
                 printk(KERN_ERR "no UART detected at 0x%lx\n", iobase);
                 snd_uart16550_free(uart);
@@ -819 +821 @@
 
         /* Register device */
-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, uart, &ops)) < 0) {
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, uart, &ops);
+        if (err < 0) {
                 snd_uart16550_free(uart);
                 return err;
@@ -933 +936 @@
         strcpy(card->shortname, "Serial MIDI (UART16550A)");
 
-        if ((err = snd_uart16550_create(card,
-                                        port[dev],
-                                        irq[dev],
-                                        speed[dev],
-                                        base[dev],
-                                        adaptor[dev],
-                                        droponfull[dev],
-                                        &uart)) < 0)
+        err = snd_uart16550_create(card, port[dev], irq[dev], speed[dev],
+                                   base[dev], adaptor[dev], droponfull[dev],
+                                   &uart);
+        if (err < 0)
                 goto _err;
 
@@ -953 +952 @@
                 uart->irq);
 
-        if ((err = snd_card_register(card)) < 0)
+        err = snd_card_register(card);
+        if (err < 0)
                 goto _err;
 
@@ -993 +993 @@
         int i, cards, err;
 
-        if ((err = platform_driver_register(&snd_serial_driver)) < 0)
+        err = platform_driver_register(&snd_serial_driver);
+        if (err < 0)
                 return err;