diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2015-07-28 04:53:17 -0400 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2015-08-16 00:26:42 -0400 |
commit | 23597e2642ca76883ef533d3e3947b859537fd49 (patch) | |
tree | e2d1237c2aa5dcf360a78c8fc5cf4229d1a4c9fc | |
parent | 8139951cae69637cc882e23f36fc45ecfa1ec814 (diff) |
drm/exynos: remove function convert_to_vm_err_msg
The convert_to_vm_err_msg is called just once by exynos_drm_gem_fault,
so it's simple not to use the function.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_gem.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index d320acd20986..f717d795e9ae 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c | |||
@@ -20,29 +20,6 @@ | |||
20 | #include "exynos_drm_buf.h" | 20 | #include "exynos_drm_buf.h" |
21 | #include "exynos_drm_iommu.h" | 21 | #include "exynos_drm_iommu.h" |
22 | 22 | ||
23 | static unsigned int convert_to_vm_err_msg(int msg) | ||
24 | { | ||
25 | unsigned int out_msg; | ||
26 | |||
27 | switch (msg) { | ||
28 | case 0: | ||
29 | case -ERESTARTSYS: | ||
30 | case -EINTR: | ||
31 | out_msg = VM_FAULT_NOPAGE; | ||
32 | break; | ||
33 | |||
34 | case -ENOMEM: | ||
35 | out_msg = VM_FAULT_OOM; | ||
36 | break; | ||
37 | |||
38 | default: | ||
39 | out_msg = VM_FAULT_SIGBUS; | ||
40 | break; | ||
41 | } | ||
42 | |||
43 | return out_msg; | ||
44 | } | ||
45 | |||
46 | static int check_gem_flags(unsigned int flags) | 23 | static int check_gem_flags(unsigned int flags) |
47 | { | 24 | { |
48 | if (flags & ~(EXYNOS_BO_MASK)) { | 25 | if (flags & ~(EXYNOS_BO_MASK)) { |
@@ -600,7 +577,16 @@ int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) | |||
600 | 577 | ||
601 | mutex_unlock(&dev->struct_mutex); | 578 | mutex_unlock(&dev->struct_mutex); |
602 | 579 | ||
603 | return convert_to_vm_err_msg(ret); | 580 | switch (ret) { |
581 | case 0: | ||
582 | case -ERESTARTSYS: | ||
583 | case -EINTR: | ||
584 | return VM_FAULT_NOPAGE; | ||
585 | case -ENOMEM: | ||
586 | return VM_FAULT_OOM; | ||
587 | default: | ||
588 | return VM_FAULT_SIGBUS; | ||
589 | } | ||
604 | } | 590 | } |
605 | 591 | ||
606 | int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) | 592 | int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) |