Commit f4e131dc authored by Octavian Purdila's avatar Octavian Purdila Committed by Greg Kroah-Hartman
Browse files

goldfish: pipe: fix warnings for 32bit builds 



drivers/platform/goldfish/goldfish_pipe.c: In function 'goldfish_cmd_status':
drivers/platform/goldfish/goldfish_pipe.c:164:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
     writel((u32)(u64)pipe, dev->base + PIPE_REG_CHANNEL);
                 ^
drivers/platform/goldfish/goldfish_pipe.c: In function 'goldfish_cmd':
drivers/platform/goldfish/goldfish_pipe.c:180:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
     writel((u32)(u64)pipe, dev->base + PIPE_REG_CHANNEL);
                 ^
drivers/platform/goldfish/goldfish_pipe.c: In function 'goldfish_pipe_read_write':
drivers/platform/goldfish/goldfish_pipe.c:337:16: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
       writel((u32)(u64)pipe, dev->base + PIPE_REG_CHANNEL);

Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
Cc: Jun Tian <jun.j.tian@intel.com>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarOctavian Purdila <octavian.purdila@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2dbdf62

drivers/platform/goldfish/goldfish_pipe.c

+5 −4
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ 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)pipe, dev->base + PIPE_REG_CHANNEL,

	gf_write64((u64)(unsigned long)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);
@@ -172,7 +172,7 @@ 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)pipe, dev->base + PIPE_REG_CHANNEL,

	gf_write64((u64)(unsigned long)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);
@@ -327,7 +327,8 @@ 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)pipe, dev->base + PIPE_REG_CHANNEL,

			gf_write64((u64)(unsigned long)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,