Skip to contentSkip to conversation

of/device: Fix up of_dma_configure_id() stub

PATCH Applied Thierry Reding 4 participants 4 messages Aug 24, 2022 – Aug 25, 2022 Device tree

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 of/device: Fix up of_dma_configure_id() stub

From: Thierry Reding <[email protected]>

Since the stub version of of_dma_configure_id() was added in commit a081bd4af4ce ("of/device: Add input id to of_dma_configure()"), it has not matched the signature of the full function, leading to build failure reports when code using this function is built on !OF configurations.

Fixes a081bd4af4ce ("of/device: Add input id to of_dma_configure()")
---
 include/linux/of_device.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/of_device.h +3 -2
index 1d7992a02e36..1a803e4335d3 100644
@@ -101,8 +101,9 @@ static inline struct device_node *of_cpu_device_node_get(int cpu)
 }
 
 static inline int of_dma_configure_id(struct device *dev,
-				   struct device_node *np,
-				   bool force_dma)
+				      struct device_node *np,
+				      bool force_dma,
+				      const u32 *id)
 {
 	return 0;
 }
Signature · 1 line
2.37.2
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

Since the stub version of of_dma_configure_id() was added in commit a081bd4af4ce ("of/device: Add input id to of_dma_configure()"), it has not matched the signature of the full function, leading to build failure reports when code using this function is built on !OF configurations.

Quoted 5 lines
Fixes a081bd4af4ce ("of/device: Add input id to of_dma_configure()")
---
 include/linux/of_device.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Quoted 19 lines
include/linux/of_device.h +3 -2
index 1d7992a02e36..1a803e4335d3 100644
@@ -101,8 +101,9 @@ static inline struct device_node *of_cpu_device_node_get(int cpu)
 }
 
 static inline int of_dma_configure_id(struct device *dev,
-				   struct device_node *np,
-				   bool force_dma)
+				      struct device_node *np,
+				      bool force_dma,
+				      const u32 *id)
 {
 	return 0;
 }
Signature · 1 line
2.37.2
Reviewed-by on v1 1/1
#2 lore raw
In reply to Thierry Reding
Quoted 19 lines · Thierry Reding

From: Thierry Reding <[email protected]>

Since the stub version of of_dma_configure_id() was added in commit a081bd4af4ce ("of/device: Add input id to of_dma_configure()"), it has not matched the signature of the full function, leading to build failure reports when code using this function is built on !OF configurations.

Fixes a081bd4af4ce ("of/device: Add input id to of_dma_configure()")
---
 include/linux/of_device.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/of_device.h +0 -0
index 1d7992a02e36..1a803e4335d3 100644
@@ -101,8 +101,9 @@ static inline struct device_node *of_cpu_device_node_get(int cpu)
 }

include/linux/of_device.h static inline struct device_node *of_cpu_device_node_get(int cpu) · line 109

Quoted 10 lines
include/linux/of_device.h +3 -2
 
 static inline int of_dma_configure_id(struct device *dev,
-				   struct device_node *np,
-				   bool force_dma)
+				      struct device_node *np,
+				      bool force_dma,
+				      const u32 *id)
 {
 	return 0;
 }
maintainer Applied
#3 lore raw
In reply to Thierry Reding
Quoted 7 lines · Thierry Reding

From: Thierry Reding <[email protected]>

Since the stub version of of_dma_configure_id() was added in commit a081bd4af4ce ("of/device: Add input id to of_dma_configure()"), it has not matched the signature of the full function, leading to build failure reports when code using this function is built on !OF configurations.

Quoted 6 lines
Fixes a081bd4af4ce ("of/device: Add input id to of_dma_configure()")
---
 include/linux/of_device.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Applied, thanks!