Changeset 693 for GPL/branches/uniaud32-next/alsa-kernel/pci/sonicvibes.c

Timestamp:

Aug 14, 2021, 9:21:05 AM (4 years ago)

Author:

Paul Smedley

Message:

Update linux source to 5.12.19

File:

• GPL/branches/uniaud32-next/alsa-kernel/pci/sonicvibes.c (modified) (3 diffs)

GPL/branches/uniaud32-next/alsa-kernel/pci/sonicvibes.c

@@ -30 +30 @@
 MODULE_DESCRIPTION("S3 SonicVibes PCI");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{S3,SonicVibes PCI}}");
 
 #if IS_REACHABLE(CONFIG_GAMEPORT)
@@ -571 +570 @@
         unsigned long flags;
 
-        div = (rate * 65536 + SV_FULLRATE / 2) / SV_FULLRATE;
+        div = DIV_ROUND_CLOSEST(rate * 65536, SV_FULLRATE);
         if (div > 65535)
                 div = 65535;
@@ -1231 +1230 @@
                 return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
-            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
+        if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(24))) {
                 dev_err(card->dev,
                         "architecture does not support 24bit PCI busmaster DMA\n");