summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2022-08-24 18:32:56 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-23 15:16:58 +0300
commita9398cb81cdc8464a308e7022d791d99dbf6480a (patch)
treec04e624ce90b9efd2c8eeb4b20c1a016c8623ae4
parent6a27acda3d6a8b388ca87868b30e1fcb05e2c18f (diff)
downloadlinux-a9398cb81cdc8464a308e7022d791d99dbf6480a.tar.xz
of/device: Fix up of_dma_configure_id() stub
commit 40bfe7a86d84cf08ac6a8fe2f0c8bf7a43edd110 upstream. 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()") Cc: stable@vger.kernel.org Signed-off-by: Thierry Reding <treding@nvidia.com> Reviewed-by: Frank Rowand <frank.rowand@sony.com> Acked-by: Lorenzo Pieralisi <lpieralisi@kernel.org> Link: https://lore.kernel.org/r/20220824153256.1437483-1-thierry.reding@gmail.com Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/linux/of_device.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 07ca187fc5e4..fe339106e02c 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -113,8 +113,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;
}