From: rkir@google.com
To: gregkh@linuxfoundation.org
Cc: tkjos@google.com, linux-kernel@vger.kernel.org,
Roman Kiryanov <rkir@google.com>
Subject: [PATCH 08/21] platform: goldfish: pipe: Remove the goldfish_pipe_miscdev global variable
Date: Fri, 14 Sep 2018 10:51:09 -0700 [thread overview]
Message-ID: <20180914175122.21036-8-rkir@google.com> (raw)
In-Reply-To: <20180914175122.21036-1-rkir@google.com>
From: Roman Kiryanov <rkir@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 <rkir@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 8a5ce7c01f11..53832e46ad1a 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -245,6 +245,8 @@ struct goldfish_pipe_dev {
/* an irq tasklet to run goldfish_interrupt_task */
struct tasklet_struct irq_tasklet;
+ struct miscdevice miscdev;
+
/* DMA info */
size_t dma_alloc_total;
};
@@ -1093,11 +1095,14 @@ static const struct file_operations goldfish_pipe_fops = {
.compat_ioctl = goldfish_dma_ioctl,
};
-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)
{
@@ -1123,7 +1128,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;
@@ -1168,7 +1174,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.397.gdd90340f6a-goog
next prev parent reply other threads:[~2018-09-14 17:52 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-14 17:51 [PATCH 01/21] platform: goldfish: pipe: Remove license boilerplate rkir
2018-09-14 17:51 ` [PATCH 02/21] platform: goldfish: pipe: Prevent memory corruption from several threads writing to the same variable rkir
2018-09-14 17:51 ` [PATCH 03/21] platform: goldfish: pipe: Remove a redundant blank line rkir
2018-09-14 17:51 ` [PATCH 04/21] platform: goldfish: pipe: Remove redundant struct declarations rkir
2018-09-14 17:51 ` [PATCH 05/21] platform: goldfish: pipe: Remove redundant header include rkir
2018-09-14 17:51 ` [PATCH 06/21] platform: goldfish: pipe: Add DMA support to goldfish pipe rkir
2018-09-25 18:31 ` Greg KH
2018-09-25 23:06 ` Roman Kiryanov
2018-09-14 17:51 ` [PATCH 07/21] platform: goldfish: pipe: Remove the goldfish_interrupt_tasklet global variable rkir
2018-09-14 17:51 ` rkir [this message]
2018-09-14 17:51 ` [PATCH 09/21] platform: goldfish: pipe: Remove the goldfish_pipe_dev " rkir
2018-09-14 17:51 ` [PATCH 10/21] platform: goldfish: pipe: Move goldfish_pipe to goldfish_pipe_v2 rkir
2018-09-14 17:51 ` [PATCH 11/21] platform: goldfish: pipe: Move memory allocation from probe to init rkir
2018-09-14 17:51 ` [PATCH 12/21] platform: goldfish: pipe: Return status from "deinit" since "remove" does not do much rkir
2018-09-14 17:51 ` [PATCH 13/21] platform: goldfish: pipe: Split the driver to v2 specific and the rest rkir
2018-09-14 17:51 ` [PATCH 14/21] platform: goldfish: pipe: Add a blank line to separate varibles and code rkir
2018-09-14 17:51 ` [PATCH 15/21] platform: goldfish: pipe: Rename the init function (add "v2") rkir
2018-09-14 17:51 ` [PATCH 16/21] platform: goldfish: pipe: Call misc_deregister if init fails rkir
2018-09-14 17:51 ` [PATCH 17/21] platform: goldfish: pipe: Add a dedicated constant for the device name rkir
2018-09-14 17:51 ` [PATCH 18/21] platform: goldfish: pipe: Rename PIPE_REG to PIPE_V2_REG rkir
2018-09-14 17:51 ` [PATCH 19/21] platform: goldfish: pipe: Add the goldfish_pipe_v1 driver rkir
2018-09-14 17:51 ` [PATCH 20/21] platform: goldfish: pipe: Remove redundant casting rkir
2018-09-14 17:51 ` [PATCH 21/21] platform: goldfish: pipe: Fix allmodconfig build rkir
2018-09-25 18:28 ` Greg KH
2018-09-26 22:27 ` Roman Kiryanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180914175122.21036-8-rkir@google.com \
--to=rkir@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tkjos@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).