Home Home > GIT Browse > SLE15-SP1-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:03:06 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-19 18:04:23 +0200
commit62c734b42dd51f3071b88e3c683c09c68d09cb62 (patch)
tree6ea3919f2bdd71d5e46ce7cc03a008c4f3f2f807
parent1fed59e611e2d58dbc7a9e9c623f3f4c78fb6a55 (diff)
drivers: provide devm_platform_ioremap_resource() (bsc#1136333
jsc#SLE-4994).
-rw-r--r--patches.drivers/drivers-provide-devm_platform_ioremap_resource.patch64
-rw-r--r--series.conf1
2 files changed, 65 insertions, 0 deletions
diff --git a/patches.drivers/drivers-provide-devm_platform_ioremap_resource.patch b/patches.drivers/drivers-provide-devm_platform_ioremap_resource.patch
new file mode 100644
index 0000000000..26051d1bab
--- /dev/null
+++ b/patches.drivers/drivers-provide-devm_platform_ioremap_resource.patch
@@ -0,0 +1,64 @@
+From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Date: Wed, 20 Feb 2019 11:12:39 +0000
+Subject: drivers: provide devm_platform_ioremap_resource()
+Patch-mainline: v5.1-rc1
+Git-commit: 7945f929f1a77a1c8887a97ca07f87626858ff42
+References: bsc#1136333 jsc#SLE-4994
+
+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>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/base/platform.c | 18 ++++++++++++++++++
+ include/linux/platform_device.h | 3 +++
+ 2 files changed, 21 insertions(+)
+
+--- a/drivers/base/platform.c
++++ b/drivers/base/platform.c
+@@ -80,6 +80,24 @@ struct resource *platform_get_resource(s
+ 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
+ * @num: IRQ number index
+--- 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 *,
diff --git a/series.conf b/series.conf
index 3e222fcac4..45ecdaf212 100644
--- a/series.conf
+++ b/series.conf
@@ -45516,6 +45516,7 @@
patches.drivers/rtc-88pm80x-fix-unintended-sign-extension.patch
patches.drivers/rtc-pm8xxx-fix-unintended-sign-extension.patch
patches.fixes/0001-backlight-pwm_bl-Use-gpiod_get_value_cansleep-to-get.patch
+ patches.drivers/drivers-provide-devm_platform_ioremap_resource.patch
patches.drivers/gpio-gpio-omap-fix-level-interrupt-idling.patch
patches.drivers/cdrom-Fix-race-condition-in-cdrom_sysctl_register.patch
patches.suse/0275-bcache-never-writeback-a-discard-operation.patch