From patchwork Fri Jul 22 17:44:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 9244033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A574D602F0 for ; Fri, 22 Jul 2016 17:45:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 973FB27D8D for ; Fri, 22 Jul 2016 17:45:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B72B27FA9; Fri, 22 Jul 2016 17:45:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F408927D8D for ; Fri, 22 Jul 2016 17:45:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 539CD6EC25; Fri, 22 Jul 2016 17:45:07 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-io0-x236.google.com (mail-io0-x236.google.com [IPv6:2607:f8b0:4001:c06::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id 02DDC6EC25 for ; Fri, 22 Jul 2016 17:45:04 +0000 (UTC) Received: by mail-io0-x236.google.com with SMTP id b62so111403419iod.3 for ; Fri, 22 Jul 2016 10:45:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jBa93yx1iC0qLo59JKKXDR4ztRJ2MQ4zAd5HfpVjle0=; b=BzfqkLJIJD6Fn4oJofC1Ee+YHUkOjmXyet5Gn6dygWYL/Ekb8Ik12GjPoRY1dbFghY BtstfGR7KNFmKytBrOTKFY9h3MBh2HhAyXBQfftducNMHEiEMp6ckPlu2hLldPJsBtlF M2dwkQ7Y9L7vy/KcdGN567xv7UfWlwQwMRW2A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jBa93yx1iC0qLo59JKKXDR4ztRJ2MQ4zAd5HfpVjle0=; b=DS7ue6XuNc2sAlJAxu4iYu5NLa6mgtqRB47EWcWVnkonD5Hhl7PE6hOPk1xzA3bGUS n2RWCjslrIaq4VguiJuqkEhuck+ceu7XobTiG8gxz6Mfj70W++sCTGJR3S8FnM9bD3n9 lEYuD6h3/7m5DmFJMIKcRoplDZQqmnyD+wnyZxiotlvZBX/9UbUaDn2uC65C+56Q5UpK 5n9pshdaNMaigpeMVwNPcjcVCFccg5pj7Dbx+46/pI7fN3Rb2gzEhWrO432QSM0M5/es rpONEV7f/y6+ngqukcixJFn9cWuUJxMVe/6RXvverH1r26Y6bBlK7D++k4wCCV8wcwlt fskw== X-Gm-Message-State: AEkoouuxU8pufzrmUcRelo6moq7Pq9C5MLv4WKB1+tWhB1KgSLFhkevWq7RM2eY2XrD+SBz3 X-Received: by 10.107.35.129 with SMTP id j123mr6770916ioj.4.1469209485036; Fri, 22 Jul 2016 10:44:45 -0700 (PDT) Received: from seanpaul0.gateway.2wire.net ([142.114.99.166]) by smtp.gmail.com with ESMTPSA id x14sm3728265ita.1.2016.07.22.10.44.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Jul 2016 10:44:44 -0700 (PDT) From: Sean Paul To: elfring@users.sourceforge.net, wharms@bfs.de Subject: [PATCH] drm/etnaviv: Improve readability in __etnaviv_gem_new Date: Fri, 22 Jul 2016 13:44:38 -0400 Message-Id: <1469209478-25713-1-git-send-email-seanpaul@chromium.org> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <57924CC2.5030309@bfs.de> References: <57924CC2.5030309@bfs.de> Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux@armlinux.org.uk, julia.lawall@lip6.fr 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-Virus-Scanned: ClamAV using ClamSMTP Move things around a little in __etnaviv_gem_new() to make it more readable. Reported-by: Markus Elfring Reported-by: walter harms Signed-off-by: Sean Paul --- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index df9bcba..7d13628 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -640,6 +640,7 @@ static struct drm_gem_object *__etnaviv_gem_new(struct drm_device *dev, u32 size, u32 flags) { struct drm_gem_object *obj = NULL; + struct address_space *mapping; int ret; size = PAGE_ALIGN(size); @@ -650,23 +651,19 @@ static struct drm_gem_object *__etnaviv_gem_new(struct drm_device *dev, goto fail; ret = drm_gem_object_init(dev, obj, size); - if (ret == 0) { - struct address_space *mapping; - - /* - * Our buffers are kept pinned, so allocating them - * from the MOVABLE zone is a really bad idea, and - * conflicts with CMA. See coments above new_inode() - * why this is required _and_ expected if you're - * going to pin these pages. - */ - mapping = file_inode(obj->filp)->i_mapping; - mapping_set_gfp_mask(mapping, GFP_HIGHUSER); - } - if (ret) goto fail; + /* + * Our buffers are kept pinned, so allocating them + * from the MOVABLE zone is a really bad idea, and + * conflicts with CMA. See coments above new_inode() + * why this is required _and_ expected if you're + * going to pin these pages. + */ + mapping = file_inode(obj->filp)->i_mapping; + mapping_set_gfp_mask(mapping, GFP_HIGHUSER); + return obj; fail: