From patchwork Tue Jul 28 08:53:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 6880831 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4BC079F380 for ; Tue, 28 Jul 2015 08:53:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B5952073E for ; Tue, 28 Jul 2015 08:53:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B4AB020620 for ; Tue, 28 Jul 2015 08:53:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B5E2A6E84E; Tue, 28 Jul 2015 01:53:32 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTPS id DB4696E844 for ; Tue, 28 Jul 2015 01:53:30 -0700 (PDT) Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NS601WH6WP5VWD0@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Tue, 28 Jul 2015 17:53:29 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.115]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 03.30.28411.90347B55; Tue, 28 Jul 2015 17:53:29 +0900 (KST) X-AuditID: cbfee68e-f79c56d000006efb-18-55b74309a6ca Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id E2.82.07062.90347B55; Tue, 28 Jul 2015 17:53:29 +0900 (KST) Received: from localhost.localdomain ([10.252.81.123]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NS60042VWP4KW00@mmp2.samsung.com>; Tue, 28 Jul 2015 17:53:29 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH 02/14] drm/exynos: remove function convert_to_vm_err_msg Date: Tue, 28 Jul 2015 17:53:17 +0900 Message-id: <1438073609-32664-2-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1438073609-32664-1-git-send-email-jy0922.shim@samsung.com> References: <1438073609-32664-1-git-send-email-jy0922.shim@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRsSkWJfTeXuowb+nwhZXvr5ns5h0fwKL xYt7F1ksZkx+yebA4nG/+ziTR9+WVYwBTFFcNimpOZllqUX6dglcGQ2v/zIVXOCueHR7ClMD 43HOLkZODgkBE4nevsVMELaYxIV769m6GLk4hARWMErcnnuBDabo5rW9UIlZjBKLZsxigXB+ MEqcebGcGaSKTUBP4s6242CjRASUJf5OXMUIYjMLeEqsWDUPLC4s4CFx4eRLsHoWAVWJCxN/ soPYvALuEmdPv2OG2CYncfLYZFYQmxOo/uihfWC2EFDN6h8tjCCLJQTes0kc372IEWKQgMS3 yYeALuIASshKbDoANUdS4uCKGywTGIUXMDKsYhRNLUguKE5KLzLSK07MLS7NS9dLzs/dxAgM 19P/nvXtYLx5wPoQowAHoxIP74R120KFWBPLiitzDzGaAm2YyCwlmpwPjIq8knhDYzMjC1MT U2Mjc0szJXHeBKmfwUIC6YklqdmpqQWpRfFFpTmpxYcYmTg4pRoYbRU9FxekvWViVKgyOaA4 dU1n3u/A8883djxgcbPNzy6otE/mOM3h+3dT4e2SNx9uVj5+5nHGI70ky3jJpEunXWYmP1Ry L2u/sPEC3+6tO9axODsX6bSu3Hw/69dThkAzzgSDe4x363cILFTO3rjRceoSAfUTLFrOEYsX 6epoTtYQ3ZW6cNsrJZbijERDLeai4kQAU+H4ulICAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42I5/e+xoC6n8/ZQg/a1/BZXvr5ns5h0fwKL xYt7F1ksZkx+yebA4nG/+ziTR9+WVYwBTFENjDYZqYkpqUUKqXnJ+SmZeem2St7B8c7xpmYG hrqGlhbmSgp5ibmptkouPgG6bpk5QKuUFMoSc0qBQgGJxcVK+naYJoSGuOlawDRG6PqGBMH1 GBmggYQ1jBkNr/8yFVzgrnh0ewpTA+Nxzi5GTg4JAROJm9f2skHYYhIX7q0Hsrk4hARmMUos mjGLBcL5wShx5sVyZpAqNgE9iTvbjjOB2CICyhJ/J65iBLGZBTwlVqyaBxYXFvCQuHDyJVg9 i4CqxIWJP9lBbF4Bd4mzp98xQ2yTkzh5bDIriM0JVH/00D4wWwioZvWPFsYJjLwLGBlWMUqk FiQXFCel5xrlpZbrFSfmFpfmpesl5+duYgTHxDPpHYyHd7kfYhTgYFTi4X2xYVuoEGtiWXFl 7iFGCQ5mJRHeP4bbQ4V4UxIrq1KL8uOLSnNSiw8xmgIdNpFZSjQ5HxiveSXxhsYmZkaWRuaG FkbG5krivPomm0KFBNITS1KzU1MLUotg+pg4OKUaGLVO/jnibscbs3rmQavwfh+7wjMi/Q49 EyVnbsguOs8mfe+1X+Ara0EHJu2Tvus6rfWE0+0uf1+bMXPqH0Pf/x//f97Hd+K8bFr6ihNs EY3R4h0qFutOZxzrKWCTSpH/9Lx0jVVSwpTyvqUrTXOen0i22XXFpfCz8xKR9XpX14fstOZa Zrr4sxJLcUaioRZzUXEiAEEI+EufAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: sw0312.kim@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index d320acd..752cb7c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -20,29 +20,6 @@ #include "exynos_drm_buf.h" #include "exynos_drm_iommu.h" -static unsigned int convert_to_vm_err_msg(int msg) -{ - unsigned int out_msg; - - switch (msg) { - case 0: - case -ERESTARTSYS: - case -EINTR: - out_msg = VM_FAULT_NOPAGE; - break; - - case -ENOMEM: - out_msg = VM_FAULT_OOM; - break; - - default: - out_msg = VM_FAULT_SIGBUS; - break; - } - - return out_msg; -} - static int check_gem_flags(unsigned int flags) { if (flags & ~(EXYNOS_BO_MASK)) { @@ -600,7 +577,15 @@ int exynos_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) mutex_unlock(&dev->struct_mutex); - return convert_to_vm_err_msg(ret); + switch (ret) { + case 0: + case -ERESTARTSYS: + return VM_FAULT_NOPAGE; + case -ENOMEM: + return VM_FAULT_OOM; + default: + return VM_FAULT_SIGBUS; + } } int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)