ALSA: Clean up SG-buffer helper functions and macros

Clean up SG-buffer helper functions and macros.  Helpers take substream
as arguments now.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

1 files changed, 3 insertions, 2 deletions

diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 84ea35d8b252..8766848bbe68 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -420,7 +420,6 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre
 {
         unsigned int i, idx, ofs, rest;
         struct via82xx *chip = snd_pcm_substream_chip(substream);
-        struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
 
         if (dev->table.area == NULL) {
                 /* the start of each lists must be aligned to 8 bytes,
@@ -449,12 +448,14 @@ static int build_via_table(struct viadev *dev, struct snd_pcm_substream *substre
                 do {
                         unsigned int r;
                         unsigned int flag;
+                        unsigned int addr;
 
                         if (idx >= VIA_TABLE_SIZE) {
                                 snd_printk(KERN_ERR "via82xx: too much table size!\n");
                                 return -EINVAL;
                         }
-                        ((u32 *)dev->table.area)[idx << 1] = cpu_to_le32((u32)snd_pcm_sgbuf_get_addr(sgbuf, ofs));
+                        addr = snd_pcm_sgbuf_get_addr(substream, ofs);
+                        ((u32 *)dev->table.area)[idx << 1] = cpu_to_le32(addr);
                         r = PAGE_SIZE - (ofs % PAGE_SIZE);
                         if (rest < r)
                                 r = rest;