Changeset 629 for GPL/branches/uniaud32-next/alsa-kernel/drivers/dummy.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/drivers/dummy.c (modified) (19 diffs)

GPL/branches/uniaud32-next/alsa-kernel/drivers/dummy.c

@@ -118 +118 @@
 struct snd_dummy {
         struct snd_card *card;
-        struct dummy_model *model;
+        const struct dummy_model *model;
         struct snd_pcm *pcm;
         struct snd_pcm_hardware pcm_hw;
@@ -145 +145 @@
 }
 
-static struct dummy_model model_emu10k1 = {
+static const struct dummy_model model_emu10k1 = {
         .name = "emu10k1",
         .playback_constraints = emu10k1_playback_constraints,
@@ -151 +151 @@
 };
 
-static struct dummy_model model_rme9652 = {
+static const struct dummy_model model_rme9652 = {
         .name = "rme9652",
         .buffer_bytes_max = 26 * 64 * 1024,
@@ -161 +161 @@
 };
 
-static struct dummy_model model_ice1712 = {
+static const struct dummy_model model_ice1712 = {
         .name = "ice1712",
         .buffer_bytes_max = 256 * 1024,
@@ -171 +171 @@
 };
 
-static struct dummy_model model_uda1341 = {
+static const struct dummy_model model_uda1341 = {
         .name = "uda1341",
         .buffer_bytes_max = 16380,
@@ -181 +181 @@
 };
 
-static struct dummy_model model_ac97 = {
+static const struct dummy_model model_ac97 = {
         .name = "ac97",
         .formats = SNDRV_PCM_FMTBIT_S16_LE,
@@ -191 +191 @@
 };
 
-static struct dummy_model model_ca0106 = {
+static const struct dummy_model model_ca0106 = {
         .name = "ca0106",
         .formats = SNDRV_PCM_FMTBIT_S16_LE,
@@ -205 +205 @@
 };
 
-static struct dummy_model *dummy_models[] = {
+static const struct dummy_model *dummy_models[] = {
         &model_emu10k1,
         &model_rme9652,
@@ -530 +530 @@
                 return 0;
         }
-        return snd_pcm_lib_malloc_pages(substream,
-                                        params_buffer_bytes(hw_params));
-}
-
-static int dummy_pcm_hw_free(struct snd_pcm_substream *substream)
-{
-        if (fake_buffer)
-                return 0;
-        return snd_pcm_lib_free_pages(substream);
+        return 0;
 }
 
@@ -544 +536 @@
 {
         struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
-        struct dummy_model *model = dummy->model;
+        const struct dummy_model *model = dummy->model;
         struct snd_pcm_runtime *runtime = substream->runtime;
         const struct dummy_timer_ops *ops;
@@ -653 +645 @@
 }
 
-static struct snd_pcm_ops dummy_pcm_ops = {
+static const struct snd_pcm_ops dummy_pcm_ops = {
         .open =         dummy_pcm_open,
         .close =        dummy_pcm_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    dummy_pcm_hw_params,
-        .hw_free =      dummy_pcm_hw_free,
         .prepare =      dummy_pcm_prepare,
         .trigger =      dummy_pcm_trigger,
@@ -664 +654 @@
 };
 
-static struct snd_pcm_ops dummy_pcm_ops_no_buf = {
+static const struct snd_pcm_ops dummy_pcm_ops_no_buf = {
         .open =         dummy_pcm_open,
         .close =        dummy_pcm_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    dummy_pcm_hw_params,
-        .hw_free =      dummy_pcm_hw_free,
         .prepare =      dummy_pcm_prepare,
         .trigger =      dummy_pcm_trigger,
@@ -683 +671 @@
 {
         struct snd_pcm *pcm;
-        struct snd_pcm_ops *ops;
+        const struct snd_pcm_ops *ops;
         int err;
 
@@ -701 +689 @@
         strcpy(pcm->name, "Dummy PCM");
         if (!fake_buffer) {
-                snd_pcm_lib_preallocate_pages_for_all(pcm,
+                snd_pcm_set_managed_buffer_all(pcm,
                         SNDRV_DMA_TYPE_CONTINUOUS,
-                        snd_dma_continuous_data(GFP_KERNEL),
+                        NULL,
                         0, 64*1024);
         }
@@ -862 +850 @@
 }
 
-static struct snd_kcontrol_new snd_dummy_controls[] = {
+static const struct snd_kcontrol_new snd_dummy_controls[] = {
 DUMMY_VOLUME("Master Volume", 0, MIXER_ADDR_MASTER),
 DUMMY_CAPSRC("Master Capture Switch", 0, MIXER_ADDR_MASTER),
@@ -914 +902 @@
                           struct snd_info_buffer *buffer)
 {
-        int i;
-
-        for (i = 0; i <= SNDRV_PCM_FORMAT_LAST; i++) {
-                if (dummy->pcm_hw.formats & (1ULL << i))
+        snd_pcm_format_t i;
+
+        pcm_for_each_format(i) {
+                if (dummy->pcm_hw.formats & pcm_format_to_bits(i))
                         snd_iprintf(buffer, " %s", snd_pcm_format_name(i));
         }
@@ -925 +913 @@
                         struct snd_info_buffer *buffer)
 {
-        static int rates[] = {
+        static const int rates[] = {
                 5512, 8000, 11025, 16000, 22050, 32000, 44100, 48000,
                 64000, 88200, 96000, 176400, 192000,
@@ -957 +945 @@
         .size = sizeof(dummy_pcm_hardware.item) }
 
-static struct dummy_hw_field fields[] = {
+static const struct dummy_hw_field fields[] = {
         FIELD_ENTRY(formats, "%#llx"),
         FIELD_ENTRY(rates, "%#x"),
@@ -1035 +1023 @@
         struct snd_card *card;
         struct snd_dummy *dummy;
-        struct dummy_model *m = NULL, **mdl;
+        const struct dummy_model *m = NULL, **mdl;
         int idx, err;
         int dev = devptr->id;