Re: [PATCH 03/19] goldish_pipe: rename local pin_user_pages() routine

On Wed, Oct 30, 2019 at 03:49:14PM -0700, John Hubbard wrote:

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.

Reviewed-by: Ira Weiny ira.weiny@intel.com

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/goldfish/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) } } -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 = ((last_page - first_page) >> PAGE_SHIFT) + 1; @@ -354,9 +354,9 @@ static int transfer_max_buffers(struct goldfish_pipe *pipe, if (mutex_lock_interruptible(&pipe->lock)) return -ERESTARTSYS;

• pages_count = pin_user_pages(first_page, last_page,

• 		     last_page_size, is_write,
  

• 		     pipe->pages, &iter_last_page_size);
  

• pages_count = 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;

-- 2.23.0