diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2024-05-20 10:45:47 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2024-05-20 10:54:17 +0000 |
| commit | aa0f90d1f78e86d80c5d6576a9c2e1c3a6e94c6d (patch) | |
| tree | 84b670e62f5d796a0805266e4b0a499b81bb25c1 | |
| parent | 9739f8b1aa265619aa2ff845980ace449dcfbd7c (diff) | |
| download | hikey-linaro-aa0f90d1f78e86d80c5d6576a9c2e1c3a6e94c6d.tar.gz | |
Revert "remoteproc: stm32: use correct format strings on 64-bit"
This reverts commit f0b0a4de789d0fd7640f63c76eeba68caec18744 which is
commit 03bd158e1535e68bcd2b1e095b0ebcad7c84bd20 upstream.
It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.
Bug: 161946584
Change-Id: I8f629e3f572a8af3ab30cc2bb8c98ac3eadd97e7
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
| -rw-r--r-- | drivers/remoteproc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/remoteproc/stm32_rproc.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/remoteproc/Kconfig b/drivers/remoteproc/Kconfig index 6dbf6ed10ea4..d99548fb5dde 100644 --- a/drivers/remoteproc/Kconfig +++ b/drivers/remoteproc/Kconfig @@ -249,7 +249,7 @@ config ST_SLIM_REMOTEPROC config STM32_RPROC tristate "STM32 remoteproc support" - depends on ARCH_STM32 || COMPILE_TEST + depends on ARCH_STM32 depends on REMOTEPROC select MAILBOX help diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c index 0231f30f19ab..7e62f3232a45 100644 --- a/drivers/remoteproc/stm32_rproc.c +++ b/drivers/remoteproc/stm32_rproc.c @@ -117,10 +117,10 @@ static int stm32_rproc_mem_alloc(struct rproc *rproc, struct device *dev = rproc->dev.parent; void *va; - dev_dbg(dev, "map memory: %pad+%zx\n", &mem->dma, mem->len); + dev_dbg(dev, "map memory: %pa+%x\n", &mem->dma, mem->len); va = ioremap_wc(mem->dma, mem->len); if (IS_ERR_OR_NULL(va)) { - dev_err(dev, "Unable to map memory region: %pad+0x%zx\n", + dev_err(dev, "Unable to map memory region: %pa+%x\n", &mem->dma, mem->len); return -ENOMEM; } @@ -608,7 +608,7 @@ stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) ddata->rsc_va = devm_ioremap_wc(dev, rsc_pa, RSC_TBL_SIZE); if (IS_ERR_OR_NULL(ddata->rsc_va)) { - dev_err(dev, "Unable to map memory region: %pa+%x\n", + dev_err(dev, "Unable to map memory region: %pa+%zx\n", &rsc_pa, RSC_TBL_SIZE); ddata->rsc_va = NULL; return ERR_PTR(-ENOMEM); |