video: tegra: host fix sparse error

Fix sparse warnings:
warning: incorrect type in initializer.
warning: cast removes address space of expression
warning: incorrect type in argument 1 (different address spaces)

Bug 200041935

Change-Id: I34be39f24186ecf92892bbfb64f576f6a631c946
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/660094
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Amit Sharma (SW-TEGRA) <amisharma@nvidia.com>
Reviewed-by: Mandar Potdar <mpotdar@nvidia.com>
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

diff --git a/drivers/video/tegra/host/chip_support.h b/drivers/video/tegra/host/chip_support.h
index b668dcf346da2dda7ab9082c6637a67290817d52..bba240d8a50821d14e8bd13a3faad9d433cf19e4 100644 (file)
--- a/drivers/video/tegra/host/chip_support.h
+++ b/drivers/video/tegra/host/chip_support.h
@@ -91,7 +91,7 @@ struct nvhost_syncpt_ops {
        u32 (*update_min)(struct nvhost_syncpt *, u32 id);
        void (*cpu_incr)(struct nvhost_syncpt *, u32 id);
        int (*patch_wait)(struct nvhost_syncpt *sp,
-                       void *patch_addr);
+                       void __iomem *patch_addr);
        const char * (*name)(struct nvhost_syncpt *, u32 id);
        int (*mutex_try_lock)(struct nvhost_syncpt *,
                              unsigned int idx);

diff --git a/drivers/video/tegra/host/nvdec/nvdec.c b/drivers/video/tegra/host/nvdec/nvdec.c
index e27932359a4fed17dae07d2dfb7e878224967e61..03216af41a18690ff3d2a741995119f8c0a16c02 100644 (file)
--- a/drivers/video/tegra/host/nvdec/nvdec.c
+++ b/drivers/video/tegra/host/nvdec/nvdec.c
@@ -255,17 +255,17 @@ int nvhost_nvdec_finalize_poweron(struct platform_device *dev)
 
        /* no wpr firmware does not need these */
        if (!skip_wpr_settings) {
-               u32 wpr_addr_lo = readl((u32 *)IO_TO_VIRT((
+               u32 wpr_addr_lo = readl(IO_TO_VIRT((
                                        MC_BASE_ADDR +
                                        MC_SECURITY_CARVEOUT1_BOM_0)));
-               u32 wpr_addr_hi = readl((u32 *)IO_TO_VIRT((
+               u32 wpr_addr_hi = readl(IO_TO_VIRT((
                                        MC_BASE_ADDR +
                                        MC_SECURITY_CARVEOUT1_BOM_HI_0)));
 
                /* Put the 40-bit addr formed by wpr_addr_hi and wpr_addr_lo
                   divided by 256 into 32-bit wpr_addr */
                shared_data.wpr_addr = (wpr_addr_hi << 24) + (wpr_addr_lo >> 8);
-               shared_data.wpr_size = readl((u32 *)IO_TO_VIRT((
+               shared_data.wpr_size = readl(IO_TO_VIRT((
                        MC_BASE_ADDR + MC_SECURITY_CARVEOUT1_SIZE_128KB_0)));
                shared_data.wpr_size *= 128*1024; /* multiply 128k */
        }