The memconsole driver is not using proper accessors for __iomem.  Switch
to memremap to fix this issue, and this also prepares the driver for the
removal of ioremap_cache.

Cc: Mike Waychison <mi...@google.com>
Signed-off-by: Dan Williams <dan.j.willi...@intel.com>
---
 drivers/firmware/google/memconsole.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/firmware/google/memconsole.c 
b/drivers/firmware/google/memconsole.c
index 2f569aaed4c7..1b25fba84f32 100644
--- a/drivers/firmware/google/memconsole.c
+++ b/drivers/firmware/google/memconsole.c
@@ -52,14 +52,15 @@ static ssize_t memconsole_read(struct file *filp, struct 
kobject *kobp,
        char *memconsole;
        ssize_t ret;
 
-       memconsole = ioremap_cache(memconsole_baseaddr, memconsole_length);
+       memconsole = memremap(memconsole_baseaddr, memconsole_length,
+                       MEMREMAP_CACHE);
        if (!memconsole) {
-               pr_err("memconsole: ioremap_cache failed\n");
+               pr_err("memconsole: memremap failed\n");
                return -ENOMEM;
        }
        ret = memory_read_from_buffer(buf, count, &pos, memconsole,
                                      memconsole_length);
-       iounmap(memconsole);
+       memunmap(memconsole);
        return ret;
 }
 

--
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/

Reply via email to