Merge tag 'mips_5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[linux.git] / sound / pci / ad1889.c

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 5b6452df8bbd05f15087ad54c6d82d66f4fa9d12..5d42c42491bf190582a908fc408e63b66597df44 100644 (file)
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -257,20 +257,6 @@ snd_ad1889_ac97_ready(struct snd_ad1889 *chip)
        return 0;
 }
 
-static int 
-snd_ad1889_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_ad1889_hw_free(struct snd_pcm_substream *substream)
-{
-       return snd_pcm_lib_free_pages(substream);
-}
-
 static const struct snd_pcm_hardware snd_ad1889_playback_hw = {
        .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_BLOCK_TRANSFER,
@@ -562,9 +548,6 @@ snd_ad1889_capture_pointer(struct snd_pcm_substream *ss)
 static const struct snd_pcm_ops snd_ad1889_playback_ops = {
        .open = snd_ad1889_playback_open,
        .close = snd_ad1889_playback_close,
-       .ioctl = snd_pcm_lib_ioctl,
-       .hw_params = snd_ad1889_hw_params,
-       .hw_free = snd_ad1889_hw_free,
        .prepare = snd_ad1889_playback_prepare,
        .trigger = snd_ad1889_playback_trigger,
        .pointer = snd_ad1889_playback_pointer, 
@@ -573,9 +556,6 @@ static const struct snd_pcm_ops snd_ad1889_playback_ops = {
 static const struct snd_pcm_ops snd_ad1889_capture_ops = {
        .open = snd_ad1889_capture_open,
        .close = snd_ad1889_capture_close,
-       .ioctl = snd_pcm_lib_ioctl,
-       .hw_params = snd_ad1889_hw_params,
-       .hw_free = snd_ad1889_hw_free,
        .prepare = snd_ad1889_capture_prepare,
        .trigger = snd_ad1889_capture_trigger,
        .pointer = snd_ad1889_capture_pointer, 
@@ -632,10 +612,8 @@ snd_ad1889_pcm_init(struct snd_ad1889 *chip, int device)
        chip->psubs = NULL;
        chip->csubs = NULL;
 
-       snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                             &chip->pci->dev,
-                                             BUFFER_BYTES_MAX / 2,
-                                             BUFFER_BYTES_MAX);
+       snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &chip->pci->dev,
+                                      BUFFER_BYTES_MAX / 2, BUFFER_BYTES_MAX);
 
        return 0;
 }
@@ -782,7 +760,7 @@ snd_ad1889_ac97_init(struct snd_ad1889 *chip, const char *quirk_override)
 {
        int err;
        struct snd_ac97_template ac97;
-       static struct snd_ac97_bus_ops ops = {
+       static const struct snd_ac97_bus_ops ops = {
                .write = snd_ad1889_ac97_write,
                .read = snd_ad1889_ac97_read,
        };
@@ -869,7 +847,7 @@ snd_ad1889_create(struct snd_card *card,
        int err;
 
        struct snd_ad1889 *chip;
-       static struct snd_device_ops ops = {
+       static const struct snd_device_ops ops = {
                .dev_free = snd_ad1889_dev_free,
        };
 
@@ -921,7 +899,7 @@ snd_ad1889_create(struct snd_card *card,
        }
 
        chip->irq = pci->irq;
-       synchronize_irq(chip->irq);
+       card->sync_irq = chip->irq;
 
        /* (2) initialization of the chip hardware */
        if ((err = snd_ad1889_init(chip)) < 0) {