From 194a9a06e8d3bac2dc43ff54d5cece3ba6a2e15f Mon Sep 17 00:00:00 2001 From: Suresh Gupta Date: Fri, 12 Oct 2018 15:40:22 +0530 Subject: [PATCH] v4l: xilinx-multi-scaler: Remove volatile As per Documentation/process/volatile-considered-harmful.rst, using accessor functions do not require volatile as accessors are written to prevent unwanted optimization. And we are using ioread32 and iowrite32, so volatile is not require. This patch removes the volatile from code and remove the below warning also warning: passing argument 1 of 'ioread32' discards 'const volatile' qualifier from pointer target type [-Wdiscarded-qualifiers] return ioread32(addr); ^~~~ Signed-off-by: Suresh Gupta Reviewed-by: Saurabh Sengar Signed-off-by: Michal Simek --- drivers/media/platform/xilinx/xilinx-multi-scaler.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/xilinx/xilinx-multi-scaler.c b/drivers/media/platform/xilinx/xilinx-multi-scaler.c index 5f5b67f33e9c..83ace1bce2a0 100644 --- a/drivers/media/platform/xilinx/xilinx-multi-scaler.c +++ b/drivers/media/platform/xilinx/xilinx-multi-scaler.c @@ -356,18 +356,18 @@ struct xm2m_msc_dev { #define fh_to_chanctx(__fh) container_of(__fh, struct xm2msc_chan_ctx, fh) -static inline u32 xm2msc_readreg(const volatile void __iomem *addr) +static inline u32 xm2msc_readreg(const void __iomem *addr) { return ioread32(addr); } -static inline void xm2msc_write64reg(volatile void __iomem *addr, u64 value) +static inline void xm2msc_write64reg(void __iomem *addr, u64 value) { iowrite32(lower_32_bits(value), addr); iowrite32(upper_32_bits(value), (void __iomem *)(addr + 4)); } -static inline void xm2msc_writereg(volatile void __iomem *addr, u32 value) +static inline void xm2msc_writereg(void __iomem *addr, u32 value) { iowrite32(value, addr); } @@ -647,7 +647,7 @@ xm2msc_pr_chanctx(struct xm2msc_chan_ctx *ctx, const char *fun_name) } static void -xm2msc_pr_screg(struct device *dev, const volatile void __iomem *base) +xm2msc_pr_screg(struct device *dev, const void __iomem *base) { dev_dbg(dev, "Ctr, GIE, IE, IS OUT\n"); dev_dbg(dev, "0x%x 0x%x 0x%x 0x%x 0x%x\n", -- 2.39.2