mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-16 04:04:06 +00:00
drivers/dma: dw-axi-dmac-starfive: Remove calls specific to ARM64 ACPI
iort_dma_setup() is being removed by commit db59e1b6e4
("ACPI:
arm64: Move DMA setup operations out of IORT") in iommu/next:
drivers/dma/dw-axi-dmac-starfive/starfive_dmaengine_memcpy.c: In function ‘dw_dma_async_
do_memcpy’:
drivers/dma/dw-axi-dmac-starfive/starfive_dmaengine_memcpy.c:152:2: error: implicit decl
aration of function ‘iort_dma_setup’ [-Werror=implicit-function-declaration]
152 | iort_dma_setup(dma_dev, &dma_addr, &dma_size);
| ^~~~~~~~~~~~~~
drivers/dma/dw-axi-dmac-starfive/starfive_dmaengine_memcpy.c:153:8: warning: assignment to ‘const struct iommu_ops *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
153 | iommu = iort_iommu_configure_id(dma_dev, NULL);
| ^
drivers/dma/dw-axi-dmac-starfive/starfive_dmaengine_memcpy.c: In function ‘dw_dma_memcpy_raw’:
drivers/dma/dw-axi-dmac-starfive/starfive_dmaengine_memcpy.c:223:8: warning: assignment to ‘const struct iommu_ops *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion]
223 | iommu = iort_iommu_configure_id(dma_dev, NULL);
| ^
iort_dma_setup() and iort_iommu_configure_id() are part of the ARM64
ACPI implementation. As CONFIG_ACPI_IORT cannot be enabled on RISC-V,
they were dummies anyway, so these calls can just be removed.
[Emil: remove unused local variables too]
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
---
Boot-tested, but the affected code paths were not exercised.
This commit is contained in:
parent
971173b9d1
commit
31764b3dcd
1 changed files with 2 additions and 18 deletions
|
@ -137,9 +137,6 @@ int dw_dma_async_do_memcpy(void *src, void *dst, size_t size)
|
|||
dma_addr_t src_dma, dst_dma;
|
||||
struct dma_async_tx_descriptor *desc;
|
||||
|
||||
const struct iommu_ops *iommu;
|
||||
u64 dma_addr = 0, dma_size = 0;
|
||||
|
||||
dma_dev = kzalloc(sizeof(*dma_dev), GFP_KERNEL);
|
||||
if(!dma_dev){
|
||||
dev_err(dma_dev, "kmalloc error.\n");
|
||||
|
@ -149,12 +146,7 @@ int dw_dma_async_do_memcpy(void *src, void *dst, size_t size)
|
|||
dma_dev->bus = NULL;
|
||||
dma_dev->coherent_dma_mask = 0xffffffff;
|
||||
|
||||
iort_dma_setup(dma_dev, &dma_addr, &dma_size);
|
||||
iommu = iort_iommu_configure_id(dma_dev, NULL);
|
||||
if (PTR_ERR(iommu) == -EPROBE_DEFER)
|
||||
return -EPROBE_DEFER;
|
||||
|
||||
arch_setup_dma_ops(dma_dev, dst_dma, dma_size, iommu, true);
|
||||
arch_setup_dma_ops(dma_dev, dst_dma, 0, NULL, true);
|
||||
|
||||
if(_dma_async_alloc_buf(dma_dev, &src, &dst, size, &src_dma, &dst_dma)) {
|
||||
dev_err(dma_dev, "Err alloc.\n");
|
||||
|
@ -207,9 +199,6 @@ int dw_dma_memcpy_raw(dma_addr_t src_dma, dma_addr_t dst_dma, size_t size)
|
|||
struct device *dma_dev;
|
||||
struct dma_async_tx_descriptor *desc;
|
||||
|
||||
const struct iommu_ops *iommu;
|
||||
u64 dma_addr = 0, dma_size = 0;
|
||||
|
||||
dma_dev = kzalloc(sizeof(*dma_dev), GFP_KERNEL);
|
||||
if(!dma_dev){
|
||||
DMA_PRINTK("kmalloc error.\n");
|
||||
|
@ -219,12 +208,7 @@ int dw_dma_memcpy_raw(dma_addr_t src_dma, dma_addr_t dst_dma, size_t size)
|
|||
dma_dev->bus = NULL;
|
||||
dma_dev->coherent_dma_mask = 0xffffffff;
|
||||
|
||||
iort_dma_setup(dma_dev, &dma_addr, &dma_size);
|
||||
iommu = iort_iommu_configure_id(dma_dev, NULL);
|
||||
if (PTR_ERR(iommu) == -EPROBE_DEFER)
|
||||
return -EPROBE_DEFER;
|
||||
|
||||
arch_setup_dma_ops(dma_dev, dst_dma, dma_size, iommu, true);
|
||||
arch_setup_dma_ops(dma_dev, dst_dma, 0, NULL, true);
|
||||
|
||||
chan = _dma_get_channel(DMA_MEMCPY);
|
||||
if(!chan){
|
||||
|
|
Loading…
Add table
Reference in a new issue