In preparation for deprecating ioremap_cache() convert its usage in sfi
to memremap. It's a bit awkward that we go and add back a fake __iomem
annotation, but this is to keep consistency with early_ioremap() which
does not have a 'memremap' flavor.
Cc: Len Brown <l...@kernel.org>
Signed-off-by: Dan Williams <dan.j.willi...@intel.com>
---
drivers/sfi/sfi_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/sfi/sfi_core.c b/drivers/sfi/sfi_core.c
index 296db7a69c27..d9430b845dfa 100644
--- a/drivers/sfi/sfi_core.c
+++ b/drivers/sfi/sfi_core.c
@@ -101,7 +101,7 @@ static void __iomem * __ref sfi_map_memory(u64 phys, u32
size)
return NULL;
if (sfi_use_ioremap)
- return ioremap_cache(phys, size);
+ return (void __iomem *) memremap(phys, size, MEMREMAP_WB);
else
return early_ioremap(phys, size);
}
@@ -112,7 +112,7 @@ static void __ref sfi_unmap_memory(void __iomem *virt, u32
size)
return;
if (sfi_use_ioremap)
- iounmap(virt);
+ memunmap((void __force *) virt);
else
early_iounmap(virt, size);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
