ALSA: pci: Avoid non-standard macro usage

[linux-2.6-block.git] / sound / pci / riptide / riptide.c

diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c
index 58771ae0ed631877f2a0a2bbf776192e65f10269..abcea86045ec0350c9de8aa3d36ac8a271704e4d 100644 (file)
--- a/sound/pci/riptide/riptide.c
+++ b/sound/pci/riptide/riptide.c
@@ -1550,7 +1550,7 @@ snd_riptide_hw_params(struct snd_pcm_substream *substream,
        if (sgdlist->area)
                snd_dma_free_pages(sgdlist);
        if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
-                                      snd_dma_pci_data(chip->pci),
+                                      &chip->pci->dev,
                                       sizeof(struct sgd) * (DESC_MAX_MASK + 1),
                                       sgdlist)) < 0) {
                snd_printk(KERN_ERR "Riptide: failed to alloc %d dma bytes\n",
@@ -1661,7 +1661,6 @@ static const struct snd_pcm_ops snd_riptide_playback_ops = {
        .hw_params = snd_riptide_hw_params,
        .hw_free = snd_riptide_hw_free,
        .prepare = snd_riptide_prepare,
-       .page = snd_pcm_sgbuf_ops_page,
        .trigger = snd_riptide_trigger,
        .pointer = snd_riptide_pointer,
 };
@@ -1672,7 +1671,6 @@ static const struct snd_pcm_ops snd_riptide_capture_ops = {
        .hw_params = snd_riptide_hw_params,
        .hw_free = snd_riptide_hw_free,
        .prepare = snd_riptide_prepare,
-       .page = snd_pcm_sgbuf_ops_page,
        .trigger = snd_riptide_trigger,
        .pointer = snd_riptide_pointer,
 };
@@ -1695,7 +1693,7 @@ static int snd_riptide_pcm(struct snd_riptide *chip, int device)
        strcpy(pcm->name, "RIPTIDE");
        chip->pcm = pcm;
        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,
-                                             snd_dma_pci_data(chip->pci),
+                                             &chip->pci->dev,
                                              64 * 1024, 128 * 1024);
        return 0;
 }