Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3154400ybt; Mon, 22 Jun 2020 16:48:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcQf96Q0/XY9L50YSUxKBb7MDNJUVdg10AkQ1G/HDluZfpyhEbSMFF8F5kZNoX3jQGwFPc X-Received: by 2002:a17:906:e298:: with SMTP id gg24mr17590636ejb.120.1592869681935; Mon, 22 Jun 2020 16:48:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592869681; cv=none; d=google.com; s=arc-20160816; b=H7nu8iTD+jFYNHCN/FZ3BLHP75XEbYTX7vXKyirTS/chGeOui+o51n70UOPYpC1TMA 2fKM2KvJ6yfZ1UxKUq2on2xsuW6SJqLXRT1GSMBQ2Ichf7YT4bmW7RkNn/u3ukH6kDlE 86suiqavzBW9b/Mx7WDoGO6OHg+/BmNPp9d8jAPtCi0zkn5E++EgWh8UIZs8hoOsbxW8 DDevjdYpYFwUnH+pCFEjcyiz2rR+8eX8qNyeKZBmdTQu6FRmeNXMAN1tCipSFocWMxpa cuJcqD+8uHdF7h4fvMPbicFhrxyoSwawte2KvKeprYX479JTmsyVtkvfnNKbgDG53UL8 +3Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=vetzRo7qSf24kubQfQzsa30v77hzL/+08nUTQBbHTVs=; b=VvFMJf1zukOtCtrvbaYj1axxvtBM/GybJYGlGb855QZy1Bi/HlV33iCf91coLio+91 NMMHaAbozuVvkCH51XAT0LJOBh9gBjdSdKC5ZUKM8coP1N7g5FhRHpWyKDxrLadJpORV X0pLhH8KLfOU7JTp4d16TLiAur5nIBafPk+fEBIdW87zojnjPzWtKpj199zwnpxWj6Uj YPzMPNYKfNE/NiE+1HJZ8MgXD8zDQFytCqAJ8PNvfuJovERL2DsJs3gzFeG8+EeE2uoQ g6EQlMIkOzYerRjDJWAF66BlAEvuBq645ImpDkbB3/TmQjSqGbXeUxJVe733gJE5rwxI /pMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=GTVTaiiB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c15si9724262ejx.148.2020.06.22.16.47.38; Mon, 22 Jun 2020 16:48:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=GTVTaiiB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730673AbgFVXjR (ORCPT + 99 others); Mon, 22 Jun 2020 19:39:17 -0400 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:17604 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730296AbgFVXjR (ORCPT ); Mon, 22 Jun 2020 19:39:17 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 22 Jun 2020 16:38:32 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 22 Jun 2020 16:39:17 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 22 Jun 2020 16:39:17 -0700 Received: from HQMAIL107.nvidia.com (172.20.187.13) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 22 Jun 2020 23:39:10 +0000 Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Mon, 22 Jun 2020 23:39:10 +0000 Received: from rcampbell-dev.nvidia.com (Not Verified[10.110.48.66]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Mon, 22 Jun 2020 16:39:10 -0700 From: Ralph Campbell To: , CC: Jerome Glisse , John Hubbard , Christoph Hellwig , Jason Gunthorpe , "Ben Skeggs" , Ralph Campbell Subject: [RESEND PATCH 3/3] nouveau: make nvkm_vmm_ctor() and nvkm_mmu_ptp_get() static Date: Mon, 22 Jun 2020 16:38:54 -0700 Message-ID: <20200622233854.10889-4-rcampbell@nvidia.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200622233854.10889-1-rcampbell@nvidia.com> References: <20200622233854.10889-1-rcampbell@nvidia.com> MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: quoted-printable Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1592869112; bh=vetzRo7qSf24kubQfQzsa30v77hzL/+08nUTQBbHTVs=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:X-NVConfidentiality: Content-Transfer-Encoding:Content-Type; b=GTVTaiiBw4ZCJCU4mDu19iR01bCY5Gq94MAsbMgkNT9yEliD0vup723+rKDRiR8dV WkhEFJjx9CYtHuus9iaqaIe0rVyw+s0AcU8b8asiOJORKisIlP/e090i2ZlwxdhpOh g6Dj8A9gm7fXKmdU/g9HyrSEQHw032LWLP0N2Inl2Fq+GIZXR+MxkoXEacDknLJ3SR hrYfA3DTesIpvtNRWIkvaTvgW+//cs9ntZNhv9S4HL1a0nnHUoCD9ZI+8CQc/7Y9tF kqzhv6Sxy/rTIFkd7iewBiz2YOKeH0qDqm9Y9ZJ440P7/vqTcNGmZQK/oUsm0NPgFD eveHHM97QKIVA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The functions nvkm_vmm_ctor() and nvkm_mmu_ptp_get() are not called outside of the file defining them so make them static. Signed-off-by: Ralph Campbell --- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c b/drivers/gpu/d= rm/nouveau/nvkm/subdev/mmu/base.c index ee11ccaf0563..de91e9a26172 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/base.c @@ -61,7 +61,7 @@ nvkm_mmu_ptp_put(struct nvkm_mmu *mmu, bool force, struct= nvkm_mmu_pt *pt) kfree(pt); } =20 -struct nvkm_mmu_pt * +static struct nvkm_mmu_pt * nvkm_mmu_ptp_get(struct nvkm_mmu *mmu, u32 size, bool zero) { struct nvkm_mmu_pt *pt; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c b/drivers/gpu/dr= m/nouveau/nvkm/subdev/mmu/vmm.c index 199f94e15c5f..67b00dcef4b8 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c @@ -1030,7 +1030,7 @@ nvkm_vmm_ctor_managed(struct nvkm_vmm *vmm, u64 addr,= u64 size) return 0; } =20 -int +static int nvkm_vmm_ctor(const struct nvkm_vmm_func *func, struct nvkm_mmu *mmu, u32 pd_header, bool managed, u64 addr, u64 size, struct lock_class_key *key, const char *name, diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h b/drivers/gpu/dr= m/nouveau/nvkm/subdev/mmu/vmm.h index d3f8f916d0db..a2b179568970 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h @@ -163,9 +163,6 @@ int nvkm_vmm_new_(const struct nvkm_vmm_func *, struct = nvkm_mmu *, u32 pd_header, bool managed, u64 addr, u64 size, struct lock_class_key *, const char *name, struct nvkm_vmm **); -int nvkm_vmm_ctor(const struct nvkm_vmm_func *, struct nvkm_mmu *, - u32 pd_header, bool managed, u64 addr, u64 size, - struct lock_class_key *, const char *name, struct nvkm_vmm *); struct nvkm_vma *nvkm_vmm_node_search(struct nvkm_vmm *, u64 addr); struct nvkm_vma *nvkm_vmm_node_split(struct nvkm_vmm *, struct nvkm_vma *, u64 addr, u64 size); --=20 2.20.1