| Message ID | 20170622164817.25515-2-logang@deltatee.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
On 06/22/17 19:48, Logan Gunthorpe wrote: > 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 <jsarha@ti.com> > Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> > Cc: David Airlie <airlied@linux.ie> Acked-by: Jyri Sarha <jsarha@ti.com> > --- > 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 > } > >
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 }
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 <jsarha@ti.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: David Airlie <airlied@linux.ie> --- drivers/gpu/drm/tilcdc/tilcdc_regs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)