[PATCH 02/15] platform: goldfish: pipe: Remove the goldfish_pipe_miscdev global variable

[rkir]

From: Roman Kiryanov <r...@google.com>

This is a series of patches to remove mutable global variables
to introduce another version of the pipe driver for the older
host interface. I don't want to have two driver states where
only one is used.

Signed-off-by: Roman Kiryanov <r...@google.com>
---
 drivers/platform/goldfish/goldfish_pipe.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/platform/goldfish/goldfish_pipe.c 
b/drivers/platform/goldfish/goldfish_pipe.c
index ba9aede17d57..8ca709b45e1f 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -211,6 +211,8 @@ struct goldfish_pipe_dev {
 
        /* an irq tasklet to run goldfish_interrupt_task */
        struct tasklet_struct irq_tasklet;
+
+       struct miscdevice miscdev;
 };
 
 static struct goldfish_pipe_dev goldfish_pipe_dev;
@@ -785,11 +787,14 @@ static const struct file_operations goldfish_pipe_fops = {
        .release = goldfish_pipe_release,
 };
 
-static struct miscdevice goldfish_pipe_miscdev = {
-       .minor = MISC_DYNAMIC_MINOR,
-       .name = "goldfish_pipe",
-       .fops = &goldfish_pipe_fops,
-};
+static void init_miscdevice(struct miscdevice *miscdev)
+{
+       memset(miscdev, 0, sizeof(*miscdev));
+
+       miscdev->minor = MISC_DYNAMIC_MINOR;
+       miscdev->name = "goldfish_pipe";
+       miscdev->fops = &goldfish_pipe_fops;
+}
 
 static void write_pa_addr(void *addr, void __iomem *portl, void __iomem *porth)
 {
@@ -815,7 +820,8 @@ static int goldfish_pipe_device_init(struct platform_device 
*pdev)
                return err;
        }
 
-       err = misc_register(&goldfish_pipe_miscdev);
+       init_miscdevice(&dev->miscdev);
+       err = misc_register(&dev->miscdev);
        if (err) {
                dev_err(&pdev->dev, "unable to register v2 device\n");
                return err;
@@ -860,7 +866,7 @@ static int goldfish_pipe_device_init(struct platform_device 
*pdev)
 
 static void goldfish_pipe_device_deinit(struct platform_device *pdev)
 {
-       misc_deregister(&goldfish_pipe_miscdev);
+       misc_deregister(&goldfish_pipe_dev.miscdev);
        tasklet_kill(&goldfish_pipe_dev.irq_tasklet);
        kfree(goldfish_pipe_dev.pipes);
        free_page((unsigned long)goldfish_pipe_dev.buffers);
-- 
2.19.0.605.g01d371f741-goog