From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 21 Dec 2007 04:23:48 +0000 (+1100)
Subject: [POWERPC] Pointers marked as __iomem do not need to be volatile
X-Git-Tag: firefly_0821_release~23624^2~199
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=70fbb9388365c3f6f9f17e6501a67f8636e4af08;p=firefly-linux-kernel-4.4.55.git

[POWERPC] Pointers marked as __iomem do not need to be volatile

Fixes this warning:

arch/powerpc/platforms/powermac/pci.c: In function 'u3_ht_cfg_access':
arch/powerpc/platforms/powermac/pci.c:354: warning: return discards qualifiers from pointer target type
arch/powerpc/platforms/powermac/pci.c:358: warning: return discards qualifiers from pointer target type

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index 4aeef7f3d766..9b16d3b17169 100644
--- a/include/asm-powerpc/pci-bridge.h
+++ b/include/asm-powerpc/pci-bridge.h
@@ -75,8 +75,8 @@ struct pci_controller {
 #endif
 
 	struct pci_ops *ops;
-	volatile unsigned int __iomem *cfg_addr;
-	volatile void __iomem *cfg_data;
+	unsigned int __iomem *cfg_addr;
+	void __iomem *cfg_data;
 
 #ifndef CONFIG_PPC64
 	/*