From patchwork Tue Apr 6 09:07:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 415883 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp4384941jai; Tue, 6 Apr 2021 02:08:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzo0fwJ14e+kIf9M3mhWUC1pQDiDky9mtnIZ4vg47UUAoG+UYrYn49ofF8mW9eLYF8AF+2o X-Received: by 2002:a17:902:e806:b029:e5:cb85:dc4d with SMTP id u6-20020a170902e806b02900e5cb85dc4dmr27728043plg.11.1617700091789; Tue, 06 Apr 2021 02:08:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617700091; cv=none; d=google.com; s=arc-20160816; b=S3SxtnGRuKJQCG4sOosnnYWyr1cbngt8NP7JmPjPyBC0drCkWvPSt/oIO0eCHZhMrf 8f23pSz96VPVoY0YZllMtY9aSP1d7WPG4rXEiLNczxTe9Mtmf0ZfdtUXOIC/2kllvEEV rgfy4ajAZP7D5k80p35KSlRGVZcCXU53xVUw/qoUXdCXkFI0oCtfxA6cKpiM/s7+jXvZ sQR5C7vP6P7/6BNH/4k3LAghk5XcBvffBmviU2yTTvlAUHQNPZIn++BR51knOSy96j4m YEkGIzRQUvhdh1vAdDnt+8eEjK+S/ZoK1e5u4dYa9+iVHeWo2bJ7/fhWW3GbaOc8wFdA zouw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:delivered-to; bh=HrBrYqgyoWWK5og2XpjjIX14Rh0H6JIRKU856SObmrU=; b=V06c4Z2fAzljyumrahTSEephBAbkXcIKJ/yd3OakrNq/MMraEM4Pd74sP8hDn+3HWa a4PaYT5mIhTlLe68RZw8o0LxU0MWaa1Oxyi84/i5VY4UTD9ZTTBwve1enwm4DVM9VxQj ywydYEW7yv8bxRWisfkC/d4Vm8hU1D7brFgAYQWUyZR56YavVWdnZJ9JO2glsFGgWRgg uqKXRiVXx4Thtvo0yJ3Qb0ZyAQKC7lUsbjggNxYDg1EPhr4bdTyHMwH42N5YKYqu3XZA OoD9YfskQ2P2OyzsojvyQ0Viue6vVZkE5UQph7Q8Y6HTjsinWUcVyI6VpNP5yIe5KSum sMFw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id m6si19037433pfa.145.2021.04.06.02.08.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Apr 2021 02:08:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7ADC788E9D; Tue, 6 Apr 2021 09:08:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by gabe.freedesktop.org (Postfix) with ESMTPS id CDAF889BAB; Tue, 6 Apr 2021 09:08:08 +0000 (UTC) Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4FF1ns4cs3zpVQt; Tue, 6 Apr 2021 17:05:21 +0800 (CST) Received: from thunder-town.china.huawei.com (10.174.179.202) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.498.0; Tue, 6 Apr 2021 17:07:53 +0800 From: Zhen Lei To: Ben Skeggs , David Airlie , "Daniel Vetter" , dri-devel , nouveau , linux-kernel Subject: [PATCH v2 1/1] drm/nouveau/dmem: Remove duplicated header file inclusion Date: Tue, 6 Apr 2021 17:07:50 +0800 Message-ID: <20210406090750.2477-2-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20210406090750.2477-1-thunder.leizhen@huawei.com> References: <20210406090750.2477-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.179.202] X-CFilter-Loop: Reflected X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhen Lei Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Delete one of the header files that are included twice, all included header files are then rearranged alphabetically. Signed-off-by: Zhen Lei --- drivers/gpu/drm/nouveau/nouveau_dmem.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) -- 1.8.3 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/drivers/gpu/drm/nouveau/nouveau_dmem.c b/drivers/gpu/drm/nouveau/nouveau_dmem.c index 92987daa5e17d02..8e7a1b6598e0659 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c +++ b/drivers/gpu/drm/nouveau/nouveau_dmem.c @@ -19,26 +19,23 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ -#include "nouveau_dmem.h" -#include "nouveau_drv.h" -#include "nouveau_chan.h" -#include "nouveau_dma.h" -#include "nouveau_mem.h" -#include "nouveau_bo.h" -#include "nouveau_svm.h" - +#include +#include +#include #include -#include -#include #include #include #include -#include - -#include +#include +#include -#include -#include +#include "nouveau_bo.h" +#include "nouveau_chan.h" +#include "nouveau_dma.h" +#include "nouveau_dmem.h" +#include "nouveau_drv.h" +#include "nouveau_mem.h" +#include "nouveau_svm.h" /* * FIXME: this is ugly right now we are using TTM to allocate vram and we pin