79 lines
3.0 KiB
Diff
79 lines
3.0 KiB
Diff
From 9adb641d4a64e0ed52ba63ea401a9858efe8976d Mon Sep 17 00:00:00 2001
|
|
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
|
|
Date: Wed, 20 Feb 2019 11:12:39 +0000
|
|
Subject: [PATCH 10/55] drivers: provide devm_platform_ioremap_resource()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.1-rc1
|
|
commit 306563985819ed2af9df0a26ae368ed12cf28f41
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8AU2M
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=306563985819ed2af9df0a26ae368ed12cf28f41
|
|
|
|
-------------------------------------------------------------------
|
|
|
|
There are currently 1200+ instances of using platform_get_resource()
|
|
and devm_ioremap_resource() together in the kernel tree.
|
|
|
|
This patch wraps these two calls in a single helper. Thanks to that
|
|
we don't have to declare a local variable for struct resource * and can
|
|
omit the redundant argument for resource type. We also have one
|
|
function call less.
|
|
|
|
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
|
|
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
drivers/base/platform.c | 18 ++++++++++++++++++
|
|
include/linux/platform_device.h | 3 +++
|
|
2 files changed, 21 insertions(+)
|
|
|
|
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
|
|
index be8c82cc4445..23ec70ef6897 100644
|
|
--- a/drivers/base/platform.c
|
|
+++ b/drivers/base/platform.c
|
|
@@ -80,6 +80,24 @@ struct resource *platform_get_resource(struct platform_device *dev,
|
|
}
|
|
EXPORT_SYMBOL_GPL(platform_get_resource);
|
|
|
|
+/**
|
|
+ * devm_platform_ioremap_resource - call devm_ioremap_resource() for a platform
|
|
+ * device
|
|
+ *
|
|
+ * @pdev: platform device to use both for memory resource lookup as well as
|
|
+ * resource managemend
|
|
+ * @index: resource index
|
|
+ */
|
|
+void __iomem *devm_platform_ioremap_resource(struct platform_device *pdev,
|
|
+ unsigned int index)
|
|
+{
|
|
+ struct resource *res;
|
|
+
|
|
+ res = platform_get_resource(pdev, IORESOURCE_MEM, index);
|
|
+ return devm_ioremap_resource(&pdev->dev, res);
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(devm_platform_ioremap_resource);
|
|
+
|
|
/**
|
|
* platform_get_irq - get an IRQ for a device
|
|
* @dev: platform device
|
|
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
|
|
index 1a9f38f27f65..9e5c98fcea8c 100644
|
|
--- a/include/linux/platform_device.h
|
|
+++ b/include/linux/platform_device.h
|
|
@@ -51,6 +51,9 @@ extern struct device platform_bus;
|
|
extern void arch_setup_pdev_archdata(struct platform_device *);
|
|
extern struct resource *platform_get_resource(struct platform_device *,
|
|
unsigned int, unsigned int);
|
|
+extern void __iomem *
|
|
+devm_platform_ioremap_resource(struct platform_device *pdev,
|
|
+ unsigned int index);
|
|
extern int platform_get_irq(struct platform_device *, unsigned int);
|
|
extern int platform_irq_count(struct platform_device *);
|
|
extern struct resource *platform_get_resource_byname(struct platform_device *,
|
|
--
|
|
2.27.0
|
|
|