Messages in this thread Patch in this message | | | Date | Fri, 14 Sep 2018 10:51:16 -0700 | Subject | [PATCH 15/21] platform: goldfish: pipe: Rename the init function (add "v2") | From | rkir@google ... |
| |
From: Roman Kiryanov <rkir@google.com>
This is the v2 driver, in the next few patches v1 will be introduced.
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 802bbf0d6d23..8a65cdfd6555 100644 --- a/drivers/platform/goldfish/goldfish_pipe.c +++ b/drivers/platform/goldfish/goldfish_pipe.c @@ -108,7 +108,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 6a8641c7c36e..9fa5136be909 100644 --- a/drivers/platform/goldfish/goldfish_pipe_v2.c +++ b/drivers/platform/goldfish/goldfish_pipe_v2.c @@ -1121,9 +1121,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 679d863774a8..8be09ae6d3ec 100644 --- a/drivers/platform/goldfish/goldfish_pipe_v2.h +++ b/drivers/platform/goldfish/goldfish_pipe_v2.h @@ -17,8 +17,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.397.gdd90340f6a-goog
| |