diff options
author | David Herrmann <dh.herrmann@gmail.com> | 2014-05-25 14:34:09 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-05-27 15:51:35 +1000 |
commit | 2524fc7f634d33b044e9bf91689b932e54517980 (patch) | |
tree | 17681f07d25fa90dcbb1b89841502ee694272ca0 /drivers/gpu/drm/armada/armada_gem.c | |
parent | 2123000b01792e182fc4122fdb612ed641f3385e (diff) | |
download | op-kernel-dev-2524fc7f634d33b044e9bf91689b932e54517980.zip op-kernel-dev-2524fc7f634d33b044e9bf91689b932e54517980.tar.gz |
drm/armada: use shmem helpers if possible
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>
Diffstat (limited to 'drivers/gpu/drm/armada/armada_gem.c')
-rw-r--r-- | drivers/gpu/drm/armada/armada_gem.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 887816f..bb9b642 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -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; |