|
@@ -16,7 +16,7 @@ int cam_io_w(uint32_t data, void __iomem *addr)
|
|
|
return -EINVAL;
|
|
|
|
|
|
CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", addr, data);
|
|
|
- writel_relaxed_no_log(data, addr);
|
|
|
+ writel_relaxed(data, addr);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -27,11 +27,7 @@ int cam_io_w_mb(uint32_t data, void __iomem *addr)
|
|
|
return -EINVAL;
|
|
|
|
|
|
CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", addr, data);
|
|
|
- /* Ensure previous writes are done */
|
|
|
- wmb();
|
|
|
- writel_relaxed_no_log(data, addr);
|
|
|
- /* Ensure previous writes are done */
|
|
|
- wmb();
|
|
|
+ writel(data, addr);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -60,12 +56,8 @@ uint32_t cam_io_r_mb(void __iomem *addr)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- /* Ensure previous read is done */
|
|
|
- rmb();
|
|
|
- data = readl_relaxed(addr);
|
|
|
+ data = readl(addr);
|
|
|
CAM_DBG(CAM_IO_ACCESS, "0x%pK %08x", addr, data);
|
|
|
- /* Ensure previous read is done */
|
|
|
- rmb();
|
|
|
|
|
|
return data;
|
|
|
}
|