[PATCH 1/7] drm/tilcdc: don't use volatile with iowrite64
From: Logan Gunthorpe <logang@deltatee.com>
Date: 2017-06-22 16:49:28
Also in:
dri-devel, linux-alpha, linux-arch, linux-crypto, lkml
Subsystem:
drm drivers, drm drivers and misc gpu patches, drm drivers for ti lcdc, the rest · Maintainers:
David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Jyri Sarha, Tomi Valkeinen, Linus Torvalds
This is a prep patch for adding a universal iowrite64. The patch is to prevent compiler warnings when we add iowrite64 that would occur because there is an unnecessary volatile in this driver. Signed-off-by: Logan Gunthorpe <logang@deltatee.com> Cc: Jyri Sarha <redacted> Cc: Tomi Valkeinen <redacted> Cc: David Airlie <redacted> --- drivers/gpu/drm/tilcdc/tilcdc_regs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_regs.h b/drivers/gpu/drm/tilcdc/tilcdc_regs.h
index 9d528c0a67a4..e9ce725698a9 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_regs.h
+++ b/drivers/gpu/drm/tilcdc/tilcdc_regs.h@@ -131,14 +131,14 @@ static inline void tilcdc_write(struct drm_device *dev, u32 reg, u32 data) static inline void tilcdc_write64(struct drm_device *dev, u32 reg, u64 data) { struct tilcdc_drm_private *priv = dev->dev_private; - volatile void __iomem *addr = priv->mmio + reg; + void __iomem *addr = priv->mmio + reg; #ifdef iowrite64 iowrite64(data, addr); #else __iowmb(); /* This compiles to strd (=64-bit write) on ARM7 */ - *(volatile u64 __force *)addr = __cpu_to_le64(data); + *(u64 __force *)addr = __cpu_to_le64(data); #endif }
--
2.11.0