aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben.dooks@codethink.co.uk>2016-06-21 11:16:18 -0400
committerGregory CLEMENT <gregory.clement@free-electrons.com>2016-07-11 11:58:30 -0400
commitfce7b5ae1273a27db341d5dfd51a8ca6ef4caa95 (patch)
treef6b8ff695387c771a43ceb531a7fb93f9834c512
parentd705c1a66e151e587271265c29844817d5108375 (diff)
bus: mvebu-mbus: fix __iomem on register pointers
The save_cpu_target functions should take "u32 __iomem *", not a plain "u32 *" as it is passed to register access functions. Fix the following warnings by adding the annotation: drivers/bus/mvebu-mbus.c:739:17: warning: incorrect type in argument 2 (different address spaces) drivers/bus/mvebu-mbus.c:739:17: expected void volatile [noderef] <asn:2>*addr drivers/bus/mvebu-mbus.c:739:17: got unsigned int [usertype] * drivers/bus/mvebu-mbus.c:741:17: warning: incorrect type in argument 2 (different address spaces) drivers/bus/mvebu-mbus.c:741:17: expected void volatile [noderef] <asn:2>*addr drivers/bus/mvebu-mbus.c:741:17: got unsigned int [usertype] * drivers/bus/mvebu-mbus.c:742:17: warning: incorrect type in argument 2 (different address spaces) drivers/bus/mvebu-mbus.c:742:17: expected void volatile [noderef] <asn:2>*addr drivers/bus/mvebu-mbus.c:742:17: got unsigned int [usertype] * drivers/bus/mvebu-mbus.c:744:17: warning: incorrect type in argument 2 (different address spaces) drivers/bus/mvebu-mbus.c:744:17: expected void volatile [noderef] <asn:2>*addr drivers/bus/mvebu-mbus.c:744:17: got unsigned int [usertype] * drivers/bus/mvebu-mbus.c:790:17: warning: incorrect type in argument 2 (different address spaces) drivers/bus/mvebu-mbus.c:790:17: expected void volatile [noderef] <asn:2>*addr drivers/bus/mvebu-mbus.c:790:17: got unsigned int [usertype] * drivers/bus/mvebu-mbus.c:792:17: warning: incorrect type in argument 2 (different address spaces) drivers/bus/mvebu-mbus.c:792:17: expected void volatile [noderef] <asn:2>*addr drivers/bus/mvebu-mbus.c:792:17: got unsigned int [usertype] * Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r--drivers/bus/mvebu-mbus.c8
-rw-r--r--include/linux/mbus.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index ce54a0160faa..8cac3b8d5c68 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -117,7 +117,7 @@ struct mvebu_mbus_soc_data {
117 unsigned int (*win_remap_offset)(const int win); 117 unsigned int (*win_remap_offset)(const int win);
118 void (*setup_cpu_target)(struct mvebu_mbus_state *s); 118 void (*setup_cpu_target)(struct mvebu_mbus_state *s);
119 int (*save_cpu_target)(struct mvebu_mbus_state *s, 119 int (*save_cpu_target)(struct mvebu_mbus_state *s,
120 u32 *store_addr); 120 u32 __iomem *store_addr);
121 int (*show_cpu_target)(struct mvebu_mbus_state *s, 121 int (*show_cpu_target)(struct mvebu_mbus_state *s,
122 struct seq_file *seq, void *v); 122 struct seq_file *seq, void *v);
123}; 123};
@@ -728,7 +728,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus)
728 728
729static int 729static int
730mvebu_mbus_default_save_cpu_target(struct mvebu_mbus_state *mbus, 730mvebu_mbus_default_save_cpu_target(struct mvebu_mbus_state *mbus,
731 u32 *store_addr) 731 u32 __iomem *store_addr)
732{ 732{
733 int i; 733 int i;
734 734
@@ -780,7 +780,7 @@ mvebu_mbus_dove_setup_cpu_target(struct mvebu_mbus_state *mbus)
780 780
781static int 781static int
782mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus, 782mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus,
783 u32 *store_addr) 783 u32 __iomem *store_addr)
784{ 784{
785 int i; 785 int i;
786 786
@@ -796,7 +796,7 @@ mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus,
796 return 4; 796 return 4;
797} 797}
798 798
799int mvebu_mbus_save_cpu_target(u32 *store_addr) 799int mvebu_mbus_save_cpu_target(u32 __iomem *store_addr)
800{ 800{
801 return mbus_state.soc->save_cpu_target(&mbus_state, store_addr); 801 return mbus_state.soc->save_cpu_target(&mbus_state, store_addr);
802} 802}
diff --git a/include/linux/mbus.h b/include/linux/mbus.h
index ea34a867caa0..d610232762e3 100644
--- a/include/linux/mbus.h
+++ b/include/linux/mbus.h
@@ -66,7 +66,7 @@ static inline const struct mbus_dram_target_info *mv_mbus_dram_info_nooverlap(vo
66} 66}
67#endif 67#endif
68 68
69int mvebu_mbus_save_cpu_target(u32 *store_addr); 69int mvebu_mbus_save_cpu_target(u32 __iomem *store_addr);
70void mvebu_mbus_get_pcie_mem_aperture(struct resource *res); 70void mvebu_mbus_get_pcie_mem_aperture(struct resource *res);
71void mvebu_mbus_get_pcie_io_aperture(struct resource *res); 71void mvebu_mbus_get_pcie_io_aperture(struct resource *res);
72int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, u8 *attr); 72int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, u8 *attr);