| Message ID | 20220824153256.1437483-1-thierry.reding@gmail.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | of/device: Fix up of_dma_configure_id() stub | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 1 warnings, 11 lines checked |
| robh/patch-applied | fail | build log |
On Wed, Aug 24, 2022 at 05:32:56PM +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > 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 <treding@nvidia.com> > --- > include/linux/of_device.h | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Acked-by: Lorenzo Pieralisi <lpieralisi@kernel.org> > 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 >
On 8/24/22 10:32, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > 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 <treding@nvidia.com> > --- > 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 <frank.rowand@sony.com>
On Wed, 24 Aug 2022 17:32:56 +0200, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > 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 <treding@nvidia.com> > --- > include/linux/of_device.h | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > Applied, thanks!
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; }