platform: goldfish: pipe: Rename goldfish_x to goldfish_pipe_x

Add "pipe" to the pipe related function names.

Signed-off-by: Roman Kiryanov <rkir@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index fb37499..95256a5 100644 (file)
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -213,7 +213,8 @@ struct goldfish_pipe_dev {
 
 struct goldfish_pipe_dev goldfish_pipe_dev;
 
-static int goldfish_cmd_locked(struct goldfish_pipe *pipe, enum PipeCmdCode cmd)
+static int goldfish_pipe_cmd_locked(struct goldfish_pipe *pipe,
+                                   enum PipeCmdCode cmd)
 {
        pipe->command_buffer->cmd = cmd;
        /* failure by default */
@@ -222,13 +223,13 @@ static int goldfish_cmd_locked(struct goldfish_pipe *pipe, enum PipeCmdCode cmd)
        return pipe->command_buffer->status;
 }
 
-static int goldfish_cmd(struct goldfish_pipe *pipe, enum PipeCmdCode cmd)
+static int goldfish_pipe_cmd(struct goldfish_pipe *pipe, enum PipeCmdCode cmd)
 {
        int status;
 
        if (mutex_lock_interruptible(&pipe->lock))
                return PIPE_ERROR_IO;
-       status = goldfish_cmd_locked(pipe, cmd);
+       status = goldfish_pipe_cmd_locked(pipe, cmd);
        mutex_unlock(&pipe->lock);
        return status;
 }
@@ -349,7 +350,7 @@ static int transfer_max_buffers(struct goldfish_pipe *pipe,
                pipe->command_buffer);
 
        /* Transfer the data */
-       *status = goldfish_cmd_locked(pipe,
+       *status = goldfish_pipe_cmd_locked(pipe,
                                is_write ? PIPE_CMD_WRITE : PIPE_CMD_READ);
 
        *consumed_size = pipe->command_buffer->rw_params.consumed_size;
@@ -368,7 +369,7 @@ static int wait_for_host_signal(struct goldfish_pipe *pipe, int is_write)
        set_bit(wake_bit, &pipe->flags);
 
        /* Tell the emulator we're going to wait for a wake event */
-       goldfish_cmd(pipe,
+       goldfish_pipe_cmd(pipe,
                is_write ? PIPE_CMD_WAKE_ON_WRITE : PIPE_CMD_WAKE_ON_READ);
 
        while (test_bit(wake_bit, &pipe->flags)) {
@@ -490,7 +491,7 @@ static __poll_t goldfish_pipe_poll(struct file *filp, poll_table *wait)
 
        poll_wait(filp, &pipe->wake_queue, wait);
 
-       status = goldfish_cmd(pipe, PIPE_CMD_POLL);
+       status = goldfish_pipe_cmd(pipe, PIPE_CMD_POLL);
        if (status < 0)
                return -ERESTARTSYS;
 
@@ -722,7 +723,7 @@ static int goldfish_pipe_open(struct inode *inode, struct file *file)
                        MAX_BUFFERS_PER_COMMAND;
        dev->buffers->open_command_params.command_buffer_ptr =
                        (u64)(unsigned long)__pa(pipe->command_buffer);
-       status = goldfish_cmd_locked(pipe, PIPE_CMD_OPEN);
+       status = goldfish_pipe_cmd_locked(pipe, PIPE_CMD_OPEN);
        spin_unlock_irqrestore(&dev->lock, flags);
        if (status < 0)
                goto err_cmd;
@@ -748,7 +749,7 @@ static int goldfish_pipe_release(struct inode *inode, struct file *filp)
        struct goldfish_pipe_dev *dev = pipe->dev;
 
        /* The guest is closing the channel, so tell the emulator right now */
-       goldfish_cmd(pipe, PIPE_CMD_CLOSE);
+       goldfish_pipe_cmd(pipe, PIPE_CMD_CLOSE);
 
        spin_lock_irqsave(&dev->lock, flags);
        dev->pipes[pipe->id] = NULL;