Merge branch 'fix/dapm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-block.git] / drivers / platform / goldfish / goldfish_pipe.c

diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index d9a09d9637d9a09435e9a04553621d845f6bf9dd..e7a29e2750c6aeb274047b37a9d32eb3fe70961d 100644 (file)
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -158,8 +158,8 @@ static u32 goldfish_cmd_status(struct goldfish_pipe *pipe, u32 cmd)
        struct goldfish_pipe_dev *dev = pipe->dev;
 
        spin_lock_irqsave(&dev->lock, flags);
-       gf_write64((u64)(unsigned long)pipe, dev->base + PIPE_REG_CHANNEL,
-                               dev->base + PIPE_REG_CHANNEL_HIGH);
+       gf_write_ptr(pipe, dev->base + PIPE_REG_CHANNEL,
+                    dev->base + PIPE_REG_CHANNEL_HIGH);
        writel(cmd, dev->base + PIPE_REG_COMMAND);
        status = readl(dev->base + PIPE_REG_STATUS);
        spin_unlock_irqrestore(&dev->lock, flags);
@@ -172,8 +172,8 @@ static void goldfish_cmd(struct goldfish_pipe *pipe, u32 cmd)
        struct goldfish_pipe_dev *dev = pipe->dev;
 
        spin_lock_irqsave(&dev->lock, flags);
-       gf_write64((u64)(unsigned long)pipe, dev->base + PIPE_REG_CHANNEL,
-                               dev->base + PIPE_REG_CHANNEL_HIGH);
+       gf_write_ptr(pipe, dev->base + PIPE_REG_CHANNEL,
+                    dev->base + PIPE_REG_CHANNEL_HIGH);
        writel(cmd, dev->base + PIPE_REG_COMMAND);
        spin_unlock_irqrestore(&dev->lock, flags);
 }
@@ -282,7 +282,7 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer,
                return -EIO;
 
        /* Null reads or writes succeeds */
-       if (unlikely(bufflen) == 0)
+       if (unlikely(bufflen == 0))
                return 0;
 
        /* Check the buffer range for access */
@@ -327,12 +327,12 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer,
                spin_lock_irqsave(&dev->lock, irq_flags);
                if (access_with_param(dev, CMD_WRITE_BUFFER + cmd_offset,
                                address, avail, pipe, &status)) {
-                       gf_write64((u64)(unsigned long)pipe,
-                                  dev->base + PIPE_REG_CHANNEL,
-                                  dev->base + PIPE_REG_CHANNEL_HIGH);
+                       gf_write_ptr(pipe, dev->base + PIPE_REG_CHANNEL,
+                                    dev->base + PIPE_REG_CHANNEL_HIGH);
                        writel(avail, dev->base + PIPE_REG_SIZE);
-                       gf_write64(address, dev->base + PIPE_REG_ADDRESS,
-                               dev->base + PIPE_REG_ADDRESS_HIGH);
+                       gf_write_ptr((void *)address,
+                                    dev->base + PIPE_REG_ADDRESS,
+                                    dev->base + PIPE_REG_ADDRESS_HIGH);
                        writel(CMD_WRITE_BUFFER + cmd_offset,
                                        dev->base + PIPE_REG_COMMAND);
                        status = readl(dev->base + PIPE_REG_STATUS);