Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp322758ybx;
        Wed, 30 Oct 2019 15:53:53 -0700 (PDT)
X-Google-Smtp-Source: APXvYqxAqTX0h7vOzlvAEPxnWFW3FSvt+/IeGLCaD+fzIuvK0jY/HNBK7XGSU+KyYVM9xklcYJpc
X-Received: by 2002:a05:6402:713:: with SMTP id w19mr2518834edx.239.1572476032945;
        Wed, 30 Oct 2019 15:53:52 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1572476032; cv=none;
        d=google.com; s=arc-20160816;
        b=lzIZt9mlK6or88ktMyqevFQa/XF89/e0/5XCWbxYNrcAeEiYqt9DkWhWngbyO219I9
         QGydQUglZXYF+yKcS8X9Ry1wDawYq9WCSZQhrLFAaeZvoQRdgAW6JXJidU91O1Sj5Aeg
         aI71YBVet9Ut2FX5p/aIleXF4uIuUI1RmLV9twEBIxy0hO/bzZv2wmgEdVUFFT/67I3t
         dvGb67/HL+glAn1LIx8cFvOOMmVFCugxHQJbJfKX9AaWQg39nM5S2pCsK1lZ+D0sl7nX
         lkAshBBeJwjNDz4RGJbqc1IaX+ojCz22JtSXTdTEzgDxcMJJcoKacUsA9aa8+npo65CX
         moLQ==
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=BivA9QyOArPxchgp7rWZ/PJ/DTYMWoFVd+MwMn0rTgI=;
        b=jAVud+sR2PDiovKBucwY++O5kpjzI21jTUbqrKizVbDSsT5iEIUBGJe2SSHoIfj/TY
         veaRXzwtv6OARrUTygTDJqVNQS4aWHD5H14fTtNl7MeE6FHI63aWBlCyFRLtvFHdsgGS
         4zNNgdkgPQQyuC7mk7wclPR0QYALRvvQzZaVxf2DBeoYwZlxWQjST3qanCTK5sY21GY0
         eo6uXF8xxyQic64LRL3+TVCyFzQ9wlw5kL1L382K5zvAFMo9GTu+c7TyDdLP+IO/tQ7X
         93y+fq7cqTli6npIuFlRYs8nc1hQphXJX6QJ1ssxOOCqUfJSrgrGh8gyPZfmAHl7BFHj
         skdA==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=inYr1VKQ;
       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
        by mx.google.com with ESMTP id k18si2793124edj.94.2019.10.30.15.53.29;
        Wed, 30 Oct 2019 15:53:52 -0700 (PDT)
Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=inYr1VKQ;
       spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1728251AbfJ3WwU (ORCPT <rfc822;xiaochao379261131@gmail.com>
        + 99 others); Wed, 30 Oct 2019 18:52:20 -0400
Received: from hqemgate14.nvidia.com ([216.228.121.143]:1383 "EHLO
        hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1727674AbfJ3Wtr (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 30 Oct 2019 18:49:47 -0400
Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate14.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA)
        id <B5dba13880000>; Wed, 30 Oct 2019 15:49:44 -0700
Received: from hqmail.nvidia.com ([172.20.161.6])
  by hqpgpgate101.nvidia.com (PGP Universal service);
  Wed, 30 Oct 2019 15:49:38 -0700
X-PGP-Universal: processed;
        by hqpgpgate101.nvidia.com on Wed, 30 Oct 2019 15:49:38 -0700
Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL111.nvidia.com
 (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 30 Oct
 2019 22:49:38 +0000
Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL111.nvidia.com
 (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend
 Transport; Wed, 30 Oct 2019 22:49:37 +0000
Received: from blueforge.nvidia.com (Not Verified[10.110.48.28]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121)
        id <B5dba137f0001>; Wed, 30 Oct 2019 15:49:36 -0700
From:   John Hubbard <jhubbard@nvidia.com>
To:     Andrew Morton <akpm@linux-foundation.org>
CC:     Al Viro <viro@zeniv.linux.org.uk>,
        Alex Williamson <alex.williamson@redhat.com>,
        Benjamin Herrenschmidt <benh@kernel.crashing.org>,
        =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= <bjorn.topel@intel.com>,
        Christoph Hellwig <hch@infradead.org>,
        Dan Williams <dan.j.williams@intel.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        Dave Chinner <david@fromorbit.com>,
        David Airlie <airlied@linux.ie>,
        "David S . Miller" <davem@davemloft.net>,
        Ira Weiny <ira.weiny@intel.com>, Jan Kara <jack@suse.cz>,
        Jason Gunthorpe <jgg@ziepe.ca>, Jens Axboe <axboe@kernel.dk>,
        Jonathan Corbet <corbet@lwn.net>,
        =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= <jglisse@redhat.com>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Mauro Carvalho Chehab <mchehab@kernel.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Michal Hocko <mhocko@suse.com>,
        Mike Kravetz <mike.kravetz@oracle.com>,
        Paul Mackerras <paulus@samba.org>,
        Shuah Khan <shuah@kernel.org>,
        Vlastimil Babka <vbabka@suse.cz>, <bpf@vger.kernel.org>,
        <dri-devel@lists.freedesktop.org>, <kvm@vger.kernel.org>,
        <linux-block@vger.kernel.org>, <linux-doc@vger.kernel.org>,
        <linux-fsdevel@vger.kernel.org>, <linux-kselftest@vger.kernel.org>,
        <linux-media@vger.kernel.org>, <linux-rdma@vger.kernel.org>,
        <linuxppc-dev@lists.ozlabs.org>, <netdev@vger.kernel.org>,
        <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>,
        John Hubbard <jhubbard@nvidia.com>
Subject: [PATCH 03/19] goldish_pipe: rename local pin_user_pages() routine
Date:   Wed, 30 Oct 2019 15:49:14 -0700
Message-ID: <20191030224930.3990755-4-jhubbard@nvidia.com>
X-Mailer: git-send-email 2.23.0
In-Reply-To: <20191030224930.3990755-1-jhubbard@nvidia.com>
References: <20191030224930.3990755-1-jhubbard@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=1572475784; bh=BivA9QyOArPxchgp7rWZ/PJ/DTYMWoFVd+MwMn0rTgI=;
        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=inYr1VKQQ+/f3AJ9PMbAavdzFyUp0bVR+a/Q7wotmLdt2JZrBhC2rs5jHrRwyYF0S
         aO5uYODOCX5dXT5/fs+gKo5RvdiQ5+sxSh7D3Hxo5OsdxO53oCSRqHcjMPA4dK6DaX
         j7xdlvX1z0cFoABxsiSAW7DLwV/tuHT/1Q0YfT9exr2qeN6LKFqMXaqyt7lL1U6jNy
         Sqv6+lsishbu4eLM9zaSsrnp8KygW5u0Vhshv1VfwG/76M1A1TEQPaWvkZw+gYHt+J
         UO7XZqZd7TeSpIgO4Cl76BDRmr6O9ZoMM4Wow6h3Vu5x3pHoolK6qXKxYtZ1fZdDm/
         xHJvqckDB273g==
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

1. Avoid naming conflicts: rename local static function from
"pin_user_pages()" to "pin_goldfish_pages()".

An upcoming patch will introduce a global pin_user_pages()
function.

Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 drivers/platform/goldfish/goldfish_pipe.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/g=
oldfish/goldfish_pipe.c
index cef0133aa47a..7ed2a21a0bac 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -257,12 +257,12 @@ static int goldfish_pipe_error_convert(int status)
 	}
 }
=20
-static int pin_user_pages(unsigned long first_page,
-			  unsigned long last_page,
-			  unsigned int last_page_size,
-			  int is_write,
-			  struct page *pages[MAX_BUFFERS_PER_COMMAND],
-			  unsigned int *iter_last_page_size)
+static int pin_goldfish_pages(unsigned long first_page,
+			      unsigned long last_page,
+			      unsigned int last_page_size,
+			      int is_write,
+			      struct page *pages[MAX_BUFFERS_PER_COMMAND],
+			      unsigned int *iter_last_page_size)
 {
 	int ret;
 	int requested_pages =3D ((last_page - first_page) >> PAGE_SHIFT) + 1;
@@ -354,9 +354,9 @@ static int transfer_max_buffers(struct goldfish_pipe *p=
ipe,
 	if (mutex_lock_interruptible(&pipe->lock))
 		return -ERESTARTSYS;
=20
-	pages_count =3D pin_user_pages(first_page, last_page,
-				     last_page_size, is_write,
-				     pipe->pages, &iter_last_page_size);
+	pages_count =3D pin_goldfish_pages(first_page, last_page,
+					 last_page_size, is_write,
+					 pipe->pages, &iter_last_page_size);
 	if (pages_count < 0) {
 		mutex_unlock(&pipe->lock);
 		return pages_count;
--=20
2.23.0