summaryrefslogtreecommitdiff
path: root/drivers/platform/goldfish
diff options
context:
space:
mode:
authorRoman Kiryanov <rkir@google.com>2018-08-27 21:23:05 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-14 16:31:30 +0300
commit2ed43e53e35907456389dc9d8733d2221e6ec0e7 (patch)
tree4a5884eef46876d0c891e7b2d6c9393dc4f33660 /drivers/platform/goldfish
parent46928cc6ff6d3734eda0194f4dce840989d4f19d (diff)
downloadlinux-2ed43e53e35907456389dc9d8733d2221e6ec0e7.tar.xz
platform: goldfish: pipe: Remove a redundant variable
The variable was not very useful. Signed-off-by: Roman Kiryanov <rkir@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/goldfish')
-rw-r--r--drivers/platform/goldfish/goldfish_pipe.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 62422a4282f5..3d28a9be5722 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -779,7 +779,6 @@ static struct miscdevice goldfish_pipe_miscdev = {
static int goldfish_pipe_device_init(struct platform_device *pdev)
{
struct goldfish_pipe_dev *dev = &goldfish_pipe_dev;
- char *page;
int err = devm_request_irq(&pdev->dev, dev->irq,
goldfish_pipe_interrupt,
IRQF_SHARED, "goldfish_pipe", dev);
@@ -809,12 +808,12 @@ static int goldfish_pipe_device_init(struct platform_device *pdev)
* is to just allocate a page and place the buffers in it.
*/
BUILD_BUG_ON(sizeof(struct goldfish_pipe_dev_buffers) > PAGE_SIZE);
- page = (char *)__get_free_page(GFP_KERNEL);
- if (!page) {
+ dev->buffers = (struct goldfish_pipe_dev_buffers *)
+ __get_free_page(GFP_KERNEL);
+ if (!dev->buffers) {
kfree(dev->pipes);
return -ENOMEM;
}
- dev->buffers = (struct goldfish_pipe_dev_buffers *)page;
/* Send the buffer addresses to the host */
{