Changeset 695 for GPL/trunk/alsa-kernel/pci/emu10k1

Timestamp:

Aug 21, 2021, 3:35:34 AM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/emu10k1.c (modified) (2 diffs)
• alsa-kernel/pci/emu10k1/emu10k1_main.c (modified) (1 diff)
• alsa-kernel/pci/emu10k1/emu10k1x.c (modified) (2 diffs)
• alsa-kernel/pci/emu10k1/emufx.c (modified) (3 diffs)
• alsa-kernel/pci/emu10k1/memory.c (modified) (1 diff)

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

@@ -23 +23 @@
 MODULE_DESCRIPTION("EMU10K1");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Creative Labs,SB Live!/PCI512/E-mu APS},"
-               "{Creative Labs,SB Audigy}}");
 
 #if IS_ENABLED(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER)
@@ -183 +181 @@
 #endif
  
-        strlcpy(card->driver, emu->card_capabilities->driver,
+        strscpy(card->driver, emu->card_capabilities->driver,
                 sizeof(card->driver));
-        strlcpy(card->shortname, emu->card_capabilities->name,
+        strscpy(card->shortname, emu->card_capabilities->name,
                 sizeof(card->shortname));
         snprintf(card->longname, sizeof(card->longname),

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1_main.c

@@ -1883 +1883 @@
 
         if (!*card->id && c->id)
-                strlcpy(card->id, c->id, sizeof(card->id));
+                strscpy(card->id, c->id, sizeof(card->id));
 
         is_audigy = emu->audigy = c->emu10k2_chip;

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.c

@@ -35 +35 @@
 MODULE_DESCRIPTION("EMU10K1X");
 MODULE_LICENSE("GPL");
-MODULE_SUPPORTED_DEVICE("{{Dell Creative Labs,SB Live!}");
 
 // module parameters (see "Module Parameters")
@@ -898 +897 @@
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+
+        if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                 dev_err(card->dev, "error to set 28bit mask DMA\n");
                 pci_disable_device(pci);

GPL/trunk/alsa-kernel/pci/emu10k1/emufx.c

@@ -942 +942 @@
                         id = &ctl->kcontrol->id;
                         gctl->id.iface = (__force int)id->iface;
-                        strlcpy(gctl->id.name, id->name, sizeof(gctl->id.name));
+                        strscpy(gctl->id.name, id->name, sizeof(gctl->id.name));
                         gctl->id.index = id->index;
                         gctl->id.device = id->device;
@@ -978 +978 @@
         if (err < 0)
                 goto __error;
-        strlcpy(emu->fx8010.name, icode->name, sizeof(emu->fx8010.name));
+        strscpy(emu->fx8010.name, icode->name, sizeof(emu->fx8010.name));
         /* stop FX processor - this may be dangerous, but it's better to miss
            some samples than generate wrong ones - [jk] */
@@ -1017 +1017 @@
 
         mutex_lock(&emu->fx8010.lock);
-        strlcpy(icode->name, emu->fx8010.name, sizeof(icode->name));
+        strscpy(icode->name, emu->fx8010.name, sizeof(icode->name));
         /* ok, do the main job */
         err = snd_emu10k1_gpr_peek(emu, icode);

GPL/trunk/alsa-kernel/pci/emu10k1/memory.c

@@ -376 +376 @@
 {
         if (emu->iommu_workaround) {
-                size_t npages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
+                size_t npages = DIV_ROUND_UP(size, PAGE_SIZE);
                 size_t size_real = npages * PAGE_SIZE;