2022-08-24 15:55:43

by Thierry Reding

[permalink] [raw]
Subject: [PATCH] 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()")
Signed-off-by: Thierry Reding <[email protected]>
---
include/linux/of_device.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 1d7992a02e36..1a803e4335d3 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -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;
}
--
2.37.2


2022-08-25 10:51:05

by Lorenzo Pieralisi

[permalink] [raw]
Subject: Re: [PATCH] of/device: Fix up of_dma_configure_id() stub

On Wed, Aug 24, 2022 at 05:32:56PM +0200, Thierry Reding wrote:
> 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()")
> Signed-off-by: Thierry Reding <[email protected]>
> ---
> include/linux/of_device.h | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)

Acked-by: Lorenzo Pieralisi <[email protected]>

> diff --git a/include/linux/of_device.h b/include/linux/of_device.h
> index 1d7992a02e36..1a803e4335d3 100644
> --- a/include/linux/of_device.h
> +++ b/include/linux/of_device.h
> @@ -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;
> }
> --
> 2.37.2
>

2022-08-25 16:59:31

by Frank Rowand

[permalink] [raw]
Subject: Re: [PATCH] of/device: Fix up of_dma_configure_id() stub

On 8/24/22 10:32, Thierry Reding wrote:
> 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()")
> Signed-off-by: Thierry Reding <[email protected]>
> ---
> include/linux/of_device.h | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/of_device.h b/include/linux/of_device.h
> index 1d7992a02e36..1a803e4335d3 100644
> --- a/include/linux/of_device.h
> +++ b/include/linux/of_device.h
> @@ -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;
> }


Reviewed-by: Frank Rowand <[email protected]>

2022-08-25 19:50:42

by Rob Herring (Arm)

[permalink] [raw]
Subject: Re: [PATCH] of/device: Fix up of_dma_configure_id() stub

On Wed, 24 Aug 2022 17:32:56 +0200, Thierry Reding wrote:
> 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()")
> Signed-off-by: Thierry Reding <[email protected]>
> ---
> include/linux/of_device.h | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>

Applied, thanks!