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

Timestamp:

Jan 4, 2021, 10:15:17 AM (5 years ago)

Author:

Paul Smedley

Message:

Update source to linux 5.10.4 level

File:

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

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

@@ -682 +682 @@
 }
 
-static int snd_sonicvibes_hw_params(struct snd_pcm_substream *substream,
-                                    struct snd_pcm_hw_params *hw_params)
-{
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_sonicvibes_hw_free(struct snd_pcm_substream *substream)
-{
-        return snd_pcm_lib_free_pages(substream);
-}
-
 static int snd_sonicvibes_playback_prepare(struct snd_pcm_substream *substream)
 {
@@ -847 +836 @@
         .open =         snd_sonicvibes_playback_open,
         .close =        snd_sonicvibes_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_sonicvibes_hw_params,
-        .hw_free =      snd_sonicvibes_hw_free,
         .prepare =      snd_sonicvibes_playback_prepare,
         .trigger =      snd_sonicvibes_playback_trigger,
@@ -858 +844 @@
         .open =         snd_sonicvibes_capture_open,
         .close =        snd_sonicvibes_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_sonicvibes_hw_params,
-        .hw_free =      snd_sonicvibes_hw_free,
         .prepare =      snd_sonicvibes_capture_prepare,
         .trigger =      snd_sonicvibes_capture_trigger,
@@ -884 +867 @@
         sonic->pcm = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(sonic->pci), 64*1024, 128*1024);
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       &sonic->pci->dev, 64*1024, 128*1024);
 
         return 0;
@@ -1068 +1051 @@
 }
 
-static struct snd_kcontrol_new snd_sonicvibes_controls[] = {
+static const struct snd_kcontrol_new snd_sonicvibes_controls[] = {
 SONICVIBES_DOUBLE("Capture Volume", 0, SV_IREG_LEFT_ADC, SV_IREG_RIGHT_ADC, 0, 0, 15, 0),
 SONICVIBES_DOUBLE("Aux Playback Switch", 0, SV_IREG_LEFT_AUX1, SV_IREG_RIGHT_AUX1, 7, 7, 1, 1),
@@ -1167 +1150 @@
 
 #ifdef SUPPORT_JOYSTICK
-static struct snd_kcontrol_new snd_sonicvibes_game_control =
+static const struct snd_kcontrol_new snd_sonicvibes_game_control =
 SONICVIBES_SINGLE("Joystick Speed", 0, SV_IREG_GAME_PORT, 1, 15, 0);
 
@@ -1239 +1222 @@
         unsigned int dmaa, dmac;
         int err;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_sonicvibes_dev_free,
         };
@@ -1285 +1268 @@
         }
         sonic->irq = pci->irq;
+        card->sync_irq = sonic->irq;
 
         pci_read_config_dword(pci, 0x40, &dmaa);
@@ -1392 +1376 @@
  */
 
-static struct snd_kcontrol_new snd_sonicvibes_midi_controls[] = {
+static const struct snd_kcontrol_new snd_sonicvibes_midi_controls[] = {
 SONICVIBES_SINGLE("SonicVibes Wave Source RAM", 0, SV_IREG_WAVE_SOURCE, 0, 1, 0),
 SONICVIBES_SINGLE("SonicVibes Wave Source RAM+ROM", 0, SV_IREG_WAVE_SOURCE, 1, 1, 0),