summaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorStephen Boyd <swboyd@chromium.org>2019-05-10 14:01:49 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-24 14:55:04 -0400
commite07f100993c6d411c4886ba37b2047322e302917 (patch)
tree93447f532ef1c35a71becb804b2750792379978b /drivers/firmware
parentb0503584a82814c05951b792d0177e052da2db6f (diff)
firmware: google: memconsole: Drop __iomem on memremap memory
memremap() doesn't return __iomem marked memory, so drop the marking here. This makes static analysis tools like sparse happy again. Cc: Wei-Ning Huang <wnhuang@chromium.org> Cc: Julius Werner <jwerner@chromium.org> Cc: Brian Norris <briannorris@chromium.org> Cc: Samuel Holland <samuel@sholland.org> Cc: Guenter Roeck <groeck@chromium.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Samuel Holland <samuel@sholland.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/google/memconsole-coreboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firmware/google/memconsole-coreboot.c
index cc3797f1ba85..6f695b9af3c9 100644
--- a/drivers/firmware/google/memconsole-coreboot.c
+++ b/drivers/firmware/google/memconsole-coreboot.c
@@ -34,7 +34,7 @@ struct cbmem_cons {
34#define CURSOR_MASK ((1 << 28) - 1) 34#define CURSOR_MASK ((1 << 28) - 1)
35#define OVERFLOW (1 << 31) 35#define OVERFLOW (1 << 31)
36 36
37static struct cbmem_cons __iomem *cbmem_console; 37static struct cbmem_cons *cbmem_console;
38static u32 cbmem_console_size; 38static u32 cbmem_console_size;
39 39
40/* 40/*
@@ -75,7 +75,7 @@ static ssize_t memconsole_coreboot_read(char *buf, loff_t pos, size_t count)
75 75
76static int memconsole_probe(struct coreboot_device *dev) 76static int memconsole_probe(struct coreboot_device *dev)
77{ 77{
78 struct cbmem_cons __iomem *tmp_cbmc; 78 struct cbmem_cons *tmp_cbmc;
79 79
80 tmp_cbmc = memremap(dev->cbmem_ref.cbmem_addr, 80 tmp_cbmc = memremap(dev->cbmem_ref.cbmem_addr,
81 sizeof(*tmp_cbmc), MEMREMAP_WB); 81 sizeof(*tmp_cbmc), MEMREMAP_WB);