bus: mvebu-mbus: fix __iomem on register pointers (fce7b5ae) · Commits · 戴 / test

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>

drivers/bus/mvebu-mbus.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -117,7 +117,7 @@ struct mvebu_mbus_soc_data {
	unsigned int (*win_remap_offset)(const int win);		unsigned int (*win_remap_offset)(const int win);
	void (setup_cpu_target)(struct mvebu_mbus_state s);		void (setup_cpu_target)(struct mvebu_mbus_state s);
	int (save_cpu_target)(struct mvebu_mbus_state s,		int (save_cpu_target)(struct mvebu_mbus_state s,
	u32 *store_addr);		u32 __iomem *store_addr);
	int (show_cpu_target)(struct mvebu_mbus_state s,		int (show_cpu_target)(struct mvebu_mbus_state s,
	struct seq_file seq, void v);		struct seq_file seq, void v);
	};		};
	@@ -728,7 +728,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus)

	static int		static int
	mvebu_mbus_default_save_cpu_target(struct mvebu_mbus_state *mbus,		mvebu_mbus_default_save_cpu_target(struct mvebu_mbus_state *mbus,
	u32 *store_addr)		u32 __iomem *store_addr)
	{		{
	int i;		int i;

	@@ -780,7 +780,7 @@ mvebu_mbus_dove_setup_cpu_target(struct mvebu_mbus_state *mbus)

	static int		static int
	mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus,		mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus,
	u32 *store_addr)		u32 __iomem *store_addr)
	{		{
	int i;		int i;

	@@ -796,7 +796,7 @@ mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus,
	return 4;		return 4;
	}		}

	int mvebu_mbus_save_cpu_target(u32 *store_addr)		int mvebu_mbus_save_cpu_target(u32 __iomem *store_addr)
	{		{
	return mbus_state.soc->save_cpu_target(&mbus_state, store_addr);		return mbus_state.soc->save_cpu_target(&mbus_state, store_addr);
	}		}

include/linux/mbus.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -66,7 +66,7 @@ static inline const struct mbus_dram_target_info *mv_mbus_dram_info_nooverlap(vo
	}		}
	#endif		#endif

	int mvebu_mbus_save_cpu_target(u32 *store_addr);		int mvebu_mbus_save_cpu_target(u32 __iomem *store_addr);
	void mvebu_mbus_get_pcie_mem_aperture(struct resource *res);		void mvebu_mbus_get_pcie_mem_aperture(struct resource *res);
	void mvebu_mbus_get_pcie_io_aperture(struct resource *res);		void mvebu_mbus_get_pcie_io_aperture(struct resource *res);
	int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 target, u8 attr);		int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 target, u8 attr);

Admin message