]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
drm/armada: use shmem helpers if possible
authorDavid Herrmann <dh.herrmann@gmail.com>
Sun, 25 May 2014 12:34:09 +0000 (14:34 +0200)
committerDave Airlie <airlied@redhat.com>
Tue, 27 May 2014 05:51:35 +0000 (15:51 +1000)
shmem_read_mapping_page() uses mapping_gfp_mask(mapping) as default gfp
mask. No reason to use shmem_read_mapping_page_gfp() directly if we want
the default behavior.

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/armada/armada_gem.c

index 887816f43476937fcfbceed5207025b63eccb132..bb9b642d848511217d2900faf2b4bc71a091536a 100644 (file)
@@ -433,7 +433,6 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
 
        if (dobj->obj.filp) {
                struct address_space *mapping;
-               gfp_t gfp;
                int count;
 
                count = dobj->obj.size / PAGE_SIZE;
@@ -441,12 +440,11 @@ armada_gem_prime_map_dma_buf(struct dma_buf_attachment *attach,
                        goto free_sgt;
 
                mapping = file_inode(dobj->obj.filp)->i_mapping;
-               gfp = mapping_gfp_mask(mapping);
 
                for_each_sg(sgt->sgl, sg, count, i) {
                        struct page *page;
 
-                       page = shmem_read_mapping_page_gfp(mapping, i, gfp);
+                       page = shmem_read_mapping_page(mapping, i);
                        if (IS_ERR(page)) {
                                num = i;
                                goto release;