60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
From 7c836f45222529e7ad99ae667b099ec747e87bd6 Mon Sep 17 00:00:00 2001
|
|
From: Randy Dunlap <rdunlap@infradead.org>
|
|
Date: Mon, 28 Jun 2021 14:05:20 -0700
|
|
Subject: [PATCH 104/109] spi: <linux/spi/spi.h>: add missing struct kernel-doc
|
|
entry
|
|
|
|
mainline inclusion
|
|
from mainline-v5.15-rc1
|
|
commit 8dd591ad0104593f315b6b2ab636a18c002f7d86
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8DDF5
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8dd591ad0104593f315b6b2ab636a18c002f7d86
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
Fix kernel-doc warning in spi.h by adding the missing kernel-doc entry
|
|
and also correct the original comment so that they both indicate the
|
|
correct polarity of the flag.
|
|
|
|
../include/linux/spi/spi.h:673: warning: Function parameter or member 'devm_allocated' not described in 'spi_controller'
|
|
|
|
Fixes: 794aaf01444d ("spi: Fix use-after-free with devm_spi_alloc_*")
|
|
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
|
|
Cc: William A. Kennington III <wak@google.com>
|
|
Cc: Mark Brown <broonie@kernel.org>
|
|
Cc: linux-spi@vger.kernel.org
|
|
Cc: Lukas Wunner <lukas@wunner.de>
|
|
Reviewed-by: Lukas Wunner <lukas@wunner.de>
|
|
Link: https://lore.kernel.org/r/20210628210520.5712-1-rdunlap@infradead.org
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
Signed-off-by: Jiang Yi <jiangyi38@hisilicon.com>
|
|
---
|
|
include/linux/spi/spi.h | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
|
|
index 3e51ae8bb26e..1c0a0fa34586 100644
|
|
--- a/include/linux/spi/spi.h
|
|
+++ b/include/linux/spi/spi.h
|
|
@@ -314,6 +314,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
|
|
* @max_speed_hz: Highest supported transfer speed
|
|
* @flags: other constraints relevant to this driver
|
|
* @slave: indicates that this is an SPI slave controller
|
|
+ * @devm_allocated: whether the allocation of this struct is devres-managed
|
|
* @max_transfer_size: function that returns the max transfer size for
|
|
* a &spi_device; may be %NULL, so the default %SIZE_MAX will be used.
|
|
* @max_message_size: function that returns the max message size for
|
|
@@ -450,7 +451,7 @@ struct spi_controller {
|
|
|
|
#define SPI_MASTER_GPIO_SS BIT(5) /* GPIO CS must select slave */
|
|
|
|
- /* flag indicating this is a non-devres managed controller */
|
|
+ /* flag indicating if the allocation of this struct is devres-managed */
|
|
bool devm_allocated;
|
|
|
|
/* flag indicating this is an SPI slave controller */
|
|
--
|
|
2.23.0
|
|
|