Merge tag 'sound-fix-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / drivers / parisc / sba_iommu.c

diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index f074712646891beb529bced0219551e62030bf58..225049b492e535f7bf30ac8ef00f110d4647c0c2 100644 (file)
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -278,7 +278,7 @@ sba_dump_sg( struct ioc *ioc, struct scatterlist *startsg, int nents)
                                nents,
                                (unsigned long) sg_dma_address(startsg),
                                sg_dma_len(startsg),
-                               sg_virt_addr(startsg), startsg->length);
+                               sg_virt(startsg), startsg->length);
                startsg++;
        }
 }
@@ -945,8 +945,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
 
        /* Fast path single entry scatterlists. */
        if (nents == 1) {
-               sg_dma_address(sglist) = sba_map_single(dev,
-                                               (void *)sg_virt_addr(sglist),
+               sg_dma_address(sglist) = sba_map_single(dev, sg_virt(sglist),
                                                sglist->length, direction);
                sg_dma_len(sglist)     = sglist->length;
                return 1;
@@ -1025,7 +1024,7 @@ sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
 #endif
 
        DBG_RUN_SG("%s() START %d entries,  %p,%x\n",
-               __func__, nents, sg_virt_addr(sglist), sglist->length);
+               __func__, nents, sg_virt(sglist), sglist->length);
 
        ioc = GET_IOC(dev);
 
@@ -1855,14 +1854,9 @@ sba_proc_bitmap_info(struct seq_file *m, void *p)
 {
        struct sba_device *sba_dev = sba_list;
        struct ioc *ioc = &sba_dev->ioc[0];     /* FIXME: Multi-IOC support! */
-       unsigned int *res_ptr = (unsigned int *)ioc->res_map;
-       int i;
 
-       for (i = 0; i < (ioc->res_size/sizeof(unsigned int)); ++i, ++res_ptr) {
-               if ((i & 7) == 0)
-                       seq_puts(m, "\n   ");
-               seq_printf(m, " %08x", *res_ptr);
-       }
+       seq_hex_dump(m, "   ", DUMP_PREFIX_NONE, 32, 4, ioc->res_map,
+                    ioc->res_size, false);
        seq_putc(m, '\n');
 
        return 0;