diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-09 16:24:55 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-09 16:24:54 -0800 |
commit | cc699c3f5757c73544561647f759906d3ae2c8e7 (patch) | |
tree | a7077d39cb2830c227f9275e5297d42e8d190576 | |
parent | 04fa73f4a4a45906915a20249b3b5efe81868a7c (diff) | |
parent | 3cbe226c4d31e2d45219f9163f9d8a25ec72f965 (diff) |
Merge "msm: kgsl: Declare iomem addresses as void"
-rw-r--r-- | drivers/gpu/msm/adreno.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c index 6160aa567fbf..58090d40c47a 100644 --- a/drivers/gpu/msm/adreno.c +++ b/drivers/gpu/msm/adreno.c @@ -2291,9 +2291,9 @@ static void adreno_read(struct kgsl_device *device, void __iomem *base, unsigned int mem_len) { - unsigned int __iomem *reg; + void __iomem *reg; BUG_ON(offsetwords*sizeof(uint32_t) >= mem_len); - reg = (unsigned int __iomem *)(base + (offsetwords << 2)); + reg = (base + (offsetwords << 2)); if (!in_interrupt()) kgsl_pre_hwaccess(device); @@ -2333,7 +2333,7 @@ static void adreno_regwrite(struct kgsl_device *device, unsigned int offsetwords, unsigned int value) { - unsigned int __iomem *reg; + void __iomem *reg; BUG_ON(offsetwords*sizeof(uint32_t) >= device->reg_len); @@ -2343,7 +2343,7 @@ static void adreno_regwrite(struct kgsl_device *device, trace_kgsl_regwrite(device, offsetwords, value); kgsl_cffdump_regwrite(device, offsetwords << 2, value); - reg = (unsigned int __iomem *)(device->reg_virt + (offsetwords << 2)); + reg = (device->reg_virt + (offsetwords << 2)); /*ensure previous writes post before this one, * i.e. act like normal writel() */ |