From: rkir@google.com
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, tkjos@google.com,
Roman Kiryanov <rkir@google.com>
Subject: [PATCH 12/15] platform: goldfish: pipe: Rename the init function (add "v2")
Date: Tue, 2 Oct 2018 15:19:00 -0700 [thread overview]
Message-ID: <20181002221903.19476-12-rkir@google.com> (raw)
In-Reply-To: <20181002221903.19476-1-rkir@google.com>
From: Roman Kiryanov <rkir@google.com>
This is the v2 driver. v1 will be added later.
Signed-off-by: Roman Kiryanov <rkir@google.com>
---
drivers/platform/goldfish/goldfish_pipe.c | 2 +-
drivers/platform/goldfish/goldfish_pipe_v2.c | 6 +++---
drivers/platform/goldfish/goldfish_pipe_v2.h | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 792b20bdf76c..7b0920e962eb 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -87,7 +87,7 @@ static int goldfish_pipe_probe(struct platform_device *pdev)
if (WARN_ON(version < PIPE_CURRENT_DEVICE_VERSION))
return -EINVAL;
- return goldfish_pipe_device_init(pdev, base, irq);
+ return goldfish_pipe_device_v2_init(pdev, base, irq);
}
static int goldfish_pipe_remove(struct platform_device *pdev)
diff --git a/drivers/platform/goldfish/goldfish_pipe_v2.c b/drivers/platform/goldfish/goldfish_pipe_v2.c
index 641dfdcc3ffd..9857ce07d0e6 100644
--- a/drivers/platform/goldfish/goldfish_pipe_v2.c
+++ b/drivers/platform/goldfish/goldfish_pipe_v2.c
@@ -787,9 +787,9 @@ static void write_pa_addr(void *addr, void __iomem *portl, void __iomem *porth)
writel(lower_32_bits(paddr), portl);
}
-int goldfish_pipe_device_init(struct platform_device *pdev,
- char __iomem *base,
- int irq)
+int goldfish_pipe_device_v2_init(struct platform_device *pdev,
+ char __iomem *base,
+ int irq)
{
struct goldfish_pipe_dev *dev;
int err;
diff --git a/drivers/platform/goldfish/goldfish_pipe_v2.h b/drivers/platform/goldfish/goldfish_pipe_v2.h
index 03b476fb9978..70bf4ec1fd66 100644
--- a/drivers/platform/goldfish/goldfish_pipe_v2.h
+++ b/drivers/platform/goldfish/goldfish_pipe_v2.h
@@ -3,8 +3,8 @@
#define GOLDFISH_PIPE_V2_H
/* The entry point to the pipe v2 driver */
-int goldfish_pipe_device_init(struct platform_device *pdev,
- char __iomem *base,
- int irq);
+int goldfish_pipe_device_v2_init(struct platform_device *pdev,
+ char __iomem *base,
+ int irq);
#endif /* #define GOLDFISH_PIPE_V2_H */
--
2.19.0.605.g01d371f741-goog
next prev parent reply other threads:[~2018-10-02 22:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 22:18 [PATCH 01/15] platform: goldfish: pipe: Remove the goldfish_interrupt_tasklet global variable rkir
2018-10-02 22:18 ` [PATCH 02/15] platform: goldfish: pipe: Remove the goldfish_pipe_miscdev " rkir
2018-10-02 22:18 ` [PATCH 03/15] platform: goldfish: pipe: Remove the goldfish_pipe_dev " rkir
2018-10-02 22:18 ` [PATCH 04/15] platform: goldfish: pipe: Call misc_deregister if init fails rkir
2018-10-02 22:18 ` [PATCH 05/15] platform: goldfish: pipe: Remove redundant casting rkir
2018-10-02 22:18 ` [PATCH 06/15] platform: goldfish: pipe: Move memory allocation from probe to init rkir
2018-10-02 22:18 ` [PATCH 07/15] platform: goldfish: pipe: Return status from "deinit" since "remove" does not do much rkir
2018-10-02 22:18 ` [PATCH 08/15] platform: goldfish: pipe: Add a blank line to separate varibles and code rkir
2018-10-02 22:18 ` [PATCH 09/15] platform: goldfish: pipe: Move goldfish_pipe to goldfish_pipe_v2 rkir
2018-10-02 22:18 ` [PATCH 10/15] platform: goldfish: pipe: Remove the license boilerplate rkir
2018-10-02 22:18 ` [PATCH 11/15] platform: goldfish: pipe: Split the driver to v2 specific and the rest rkir
2018-10-02 22:19 ` rkir [this message]
2018-10-02 22:19 ` [PATCH 13/15] platform: goldfish: pipe: Add a dedicated constant for the device name rkir
2018-10-02 22:19 ` [PATCH 14/15] platform: goldfish: pipe: Rename PIPE_REG to PIPE_V2_REG rkir
2018-10-02 22:19 ` [PATCH 15/15] platform: goldfish: pipe: Add the goldfish_pipe_v1 driver rkir
2018-10-02 22:30 ` [PATCH 01/15] platform: goldfish: pipe: Remove the goldfish_interrupt_tasklet global variable Greg KH
2018-10-02 22:33 ` Roman Kiryanov
2018-10-02 22:42 ` Greg KH
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=20181002221903.19476-12-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