Merge branch 'for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu

[linux.git] / sound / ppc / pmac.c

diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 1b11e53f6a629dca9507b64adbef57aecb9bc099..592532c09a82e467b7376adeec6ec98bd2e12030 100644 (file)
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -24,11 +24,11 @@
 
 
 /* fixed frequency table for awacs, screamer, burgundy, DACA (44100 max) */
-static int awacs_freqs[8] = {
+static const int awacs_freqs[8] = {
        44100, 29400, 22050, 17640, 14700, 11025, 8820, 7350
 };
 /* fixed frequency table for tumbler */
-static int tumbler_freqs[1] = {
+static const int tumbler_freqs[1] = {
        44100
 };
 
@@ -107,24 +107,6 @@ static inline int another_stream(int stream)
                SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
 }
 
-/*
- * allocate buffers
- */
-static int snd_pmac_pcm_hw_params(struct snd_pcm_substream *subs,
-                                 struct snd_pcm_hw_params *hw_params)
-{
-       return snd_pcm_lib_malloc_pages(subs, params_buffer_bytes(hw_params));
-}
-
-/*
- * release buffers
- */
-static int snd_pmac_pcm_hw_free(struct snd_pcm_substream *subs)
-{
-       snd_pcm_lib_free_pages(subs);
-       return 0;
-}
-
 /*
  * get a stream of the opposite direction
  */
@@ -671,9 +653,6 @@ static int snd_pmac_capture_close(struct snd_pcm_substream *subs)
 static const struct snd_pcm_ops snd_pmac_playback_ops = {
        .open =         snd_pmac_playback_open,
        .close =        snd_pmac_playback_close,
-       .ioctl =        snd_pcm_lib_ioctl,
-       .hw_params =    snd_pmac_pcm_hw_params,
-       .hw_free =      snd_pmac_pcm_hw_free,
        .prepare =      snd_pmac_playback_prepare,
        .trigger =      snd_pmac_playback_trigger,
        .pointer =      snd_pmac_playback_pointer,
@@ -682,9 +661,6 @@ static const struct snd_pcm_ops snd_pmac_playback_ops = {
 static const struct snd_pcm_ops snd_pmac_capture_ops = {
        .open =         snd_pmac_capture_open,
        .close =        snd_pmac_capture_close,
-       .ioctl =        snd_pcm_lib_ioctl,
-       .hw_params =    snd_pmac_pcm_hw_params,
-       .hw_free =      snd_pmac_pcm_hw_free,
        .prepare =      snd_pmac_capture_prepare,
        .trigger =      snd_pmac_capture_trigger,
        .pointer =      snd_pmac_capture_pointer,
@@ -721,9 +697,9 @@ int snd_pmac_pcm_new(struct snd_pmac *chip)
        chip->capture.cur_freqs = chip->freqs_ok;
 
        /* preallocate 64k buffer */
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                             &chip->pdev->dev,
-                                             64 * 1024, 64 * 1024);
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                      &chip->pdev->dev,
+                                      64 * 1024, 64 * 1024);
 
        return 0;
 }
@@ -1128,7 +1104,7 @@ static int pmac_hp_detect_get(struct snd_kcontrol *kcontrol,
        return 0;
 }
 
-static struct snd_kcontrol_new auto_mute_controls[] = {
+static const struct snd_kcontrol_new auto_mute_controls[] = {
        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
          .name = "Auto Mute Switch",
          .info = snd_pmac_boolean_mono_info,
@@ -1167,7 +1143,7 @@ int snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
        int i, err;
        unsigned int irq;
        unsigned long ctrl_addr, txdma_addr, rxdma_addr;
-       static struct snd_device_ops ops = {
+       static const struct snd_device_ops ops = {
                .dev_free =     snd_pmac_dev_free,
        };
 
@@ -1198,7 +1174,7 @@ int snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
        np = chip->node;
        chip->requested = 0;
        if (chip->is_k2) {
-               static char *rnames[] = {
+               static const char * const rnames[] = {
                        "Sound Control", "Sound DMA" };
                for (i = 0; i < 2; i ++) {
                        if (of_address_to_resource(np->parent, i,
@@ -1223,7 +1199,7 @@ int snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
                txdma_addr = chip->rsrc[1].start;
                rxdma_addr = txdma_addr + 0x100;
        } else {
-               static char *rnames[] = {
+               static const char * const rnames[] = {
                        "Sound Control", "Sound Tx DMA", "Sound Rx DMA" };
                for (i = 0; i < 3; i ++) {
                        if (of_address_to_resource(np, i,