Merge tag 'microblaze-v5.1-rc1' of git://git.monstr.eu/linux-2.6-microblaze

[linux-2.6-microblaze.git] / net / rds / ib_fmr.c

diff --git a/net/rds/ib_fmr.c b/net/rds/ib_fmr.c
index e0f70c4..31cf37d 100644 (file)
--- a/net/rds/ib_fmr.c
+++ b/net/rds/ib_fmr.c
@@ -108,8 +108,8 @@ static int rds_ib_map_fmr(struct rds_ib_device *rds_ibdev,
        page_cnt = 0;
 
        for (i = 0; i < sg_dma_len; ++i) {
-               unsigned int dma_len = ib_sg_dma_len(dev, &scat[i]);
-               u64 dma_addr = ib_sg_dma_address(dev, &scat[i]);
+               unsigned int dma_len = sg_dma_len(&scat[i]);
+               u64 dma_addr = sg_dma_address(&scat[i]);
 
                if (dma_addr & ~PAGE_MASK) {
                        if (i > 0) {
@@ -148,8 +148,8 @@ static int rds_ib_map_fmr(struct rds_ib_device *rds_ibdev,
 
        page_cnt = 0;
        for (i = 0; i < sg_dma_len; ++i) {
-               unsigned int dma_len = ib_sg_dma_len(dev, &scat[i]);
-               u64 dma_addr = ib_sg_dma_address(dev, &scat[i]);
+               unsigned int dma_len = sg_dma_len(&scat[i]);
+               u64 dma_addr = sg_dma_address(&scat[i]);
 
                for (j = 0; j < dma_len; j += PAGE_SIZE)
                        dma_pages[page_cnt++] =