Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-13 15:55:00 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-15 11:46:08 +0200
commit38352aa2bc499ec26563357d136b770984018bac (patch)
tree0354bfa7a8579f312c2463e1201d370e94e6cbba
parent569b4a95c32336656d159686b4ca99a933792d8c (diff)
- spi-mem: fix kernel-doc for spi_mem_dirmap_{read|write}()
(bsc#1111666). - Refresh patches.drivers/0027-spi-spi-mem-Add-devm_spi_mem_dirmap_-create-destroy.patch.
-rw-r--r--patches.drivers/0027-spi-spi-mem-Add-devm_spi_mem_dirmap_-create-destroy.patch17
-rw-r--r--patches.drivers/spi-mem-fix-kernel-doc-for-spi_mem_dirmap_-read-writ.patch40
-rw-r--r--series.conf1
3 files changed, 46 insertions, 12 deletions
diff --git a/patches.drivers/0027-spi-spi-mem-Add-devm_spi_mem_dirmap_-create-destroy.patch b/patches.drivers/0027-spi-spi-mem-Add-devm_spi_mem_dirmap_-create-destroy.patch
index ff7decec88..15af587749 100644
--- a/patches.drivers/0027-spi-spi-mem-Add-devm_spi_mem_dirmap_-create-destroy.patch
+++ b/patches.drivers/0027-spi-spi-mem-Add-devm_spi_mem_dirmap_-create-destroy.patch
@@ -16,15 +16,13 @@ Signed-off-by: Boris Brezillon <bbrezillon@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
---
- drivers/spi/spi-mem.c | 69 +++++++++++++++++++++++++++++++++++++++++++++
- include/linux/spi/spi-mem.h | 5 ++++
+ drivers/spi/spi-mem.c | 69 ++++++++++++++++++++++++++++++++++++++++++++
+ include/linux/spi/spi-mem.h | 5 +++
2 files changed, 74 insertions(+)
-diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
-index 5217a5628be2..08e326a124cc 100644
--- a/drivers/spi/spi-mem.c
+++ b/drivers/spi/spi-mem.c
-@@ -551,6 +551,75 @@ void spi_mem_dirmap_destroy(struct spi_mem_dirmap_desc *desc)
+@@ -552,6 +552,75 @@ void spi_mem_dirmap_destroy(struct spi_m
}
EXPORT_SYMBOL_GPL(spi_mem_dirmap_destroy);
@@ -98,13 +96,11 @@ index 5217a5628be2..08e326a124cc 100644
+EXPORT_SYMBOL_GPL(devm_spi_mem_dirmap_destroy);
+
/**
- * spi_mem_dirmap_dirmap_read() - Read data through a direct mapping
+ * spi_mem_dirmap_read() - Read data through a direct mapping
* @desc: direct mapping descriptor
-diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
-index 3fe24500c5ee..3703d0dcac2e 100644
--- a/include/linux/spi/spi-mem.h
+++ b/include/linux/spi/spi-mem.h
-@@ -330,6 +330,11 @@ ssize_t spi_mem_dirmap_read(struct spi_mem_dirmap_desc *desc,
+@@ -328,6 +328,11 @@ ssize_t spi_mem_dirmap_read(struct spi_m
u64 offs, size_t len, void *buf);
ssize_t spi_mem_dirmap_write(struct spi_mem_dirmap_desc *desc,
u64 offs, size_t len, const void *buf);
@@ -116,6 +112,3 @@ index 3fe24500c5ee..3703d0dcac2e 100644
int spi_mem_driver_register_with_owner(struct spi_mem_driver *drv,
struct module *owner);
---
-2.11.0
-
diff --git a/patches.drivers/spi-mem-fix-kernel-doc-for-spi_mem_dirmap_-read-writ.patch b/patches.drivers/spi-mem-fix-kernel-doc-for-spi_mem_dirmap_-read-writ.patch
new file mode 100644
index 0000000000..f0e5005caf
--- /dev/null
+++ b/patches.drivers/spi-mem-fix-kernel-doc-for-spi_mem_dirmap_-read-writ.patch
@@ -0,0 +1,40 @@
+From 9d8371e287b9bd8f5b28386e6d7e8e9514a40aad Mon Sep 17 00:00:00 2001
+From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
+Date: Sat, 6 Apr 2019 21:33:29 +0300
+Subject: [PATCH] spi-mem: fix kernel-doc for spi_mem_dirmap_{read|write}()
+Git-commit: 9d8371e287b9bd8f5b28386e6d7e8e9514a40aad
+Patch-mainline: v5.2-rc1
+References: bsc#1111666
+
+The function names in the kernel-doc comments were mistyped, with a word
+"dirmap" being repeated twice, so fix them.
+
+Fixes: aa167f3fed0c ("spi: spi-mem: Add a new API to support direct mapping")
+Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/spi/spi-mem.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/spi/spi-mem.c
++++ b/drivers/spi/spi-mem.c
+@@ -552,7 +552,7 @@ void spi_mem_dirmap_destroy(struct spi_m
+ EXPORT_SYMBOL_GPL(spi_mem_dirmap_destroy);
+
+ /**
+- * spi_mem_dirmap_dirmap_read() - Read data through a direct mapping
++ * spi_mem_dirmap_read() - Read data through a direct mapping
+ * @desc: direct mapping descriptor
+ * @offs: offset to start reading from. Note that this is not an absolute
+ * offset, but the offset within the direct mapping which already has
+@@ -598,7 +598,7 @@ ssize_t spi_mem_dirmap_read(struct spi_m
+ EXPORT_SYMBOL_GPL(spi_mem_dirmap_read);
+
+ /**
+- * spi_mem_dirmap_dirmap_write() - Write data through a direct mapping
++ * spi_mem_dirmap_write() - Write data through a direct mapping
+ * @desc: direct mapping descriptor
+ * @offs: offset to start writing from. Note that this is not an absolute
+ * offset, but the offset within the direct mapping which already has
diff --git a/series.conf b/series.conf
index b6f7dafcab..e23bfde570 100644
--- a/series.conf
+++ b/series.conf
@@ -45643,6 +45643,7 @@
patches.drivers/spi-bcm2835aux-fix-driver-to-not-allow-65535-1-cs-gp.patch
patches.drivers/spi-bcm2835aux-warn-in-dmesg-that-native-cs-is-not-r.patch
patches.drivers/spi-bcm2835aux-setup-gpio-cs-to-output-and-correct-l.patch
+ patches.drivers/spi-mem-fix-kernel-doc-for-spi_mem_dirmap_-read-writ.patch
patches.fixes/0001-btrfs-Don-t-panic-when-we-can-t-find-a-root-key.patch
patches.drivers/mmc-core-fix-possible-use-after-free-of-host.patch
patches.drivers/mmc-core-Fix-tag-set-memory-leak.patch