Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cc5612b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-cleanup-4.8-2' of git://git.infradead.org/linux-mvebu into next/cleanup 

Merge "mvebu cleanup for 4.8 (part 2)" from Gregory CLEMENT:

More cleanup for the mvebu mbus driver this time

* tag 'mvebu-cleanup-4.8-2' of git://git.infradead.org/linux-mvebu:
  bus: mvebu-mbus: make mvebu_mbus_syscore_ops static
  bus: mvebu-mbus: fix __iomem on register pointers
parents 17bd274e ac29abf3

drivers/bus/mvebu-mbus.c

+5 −5
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ struct mvebu_mbus_soc_data { 
	unsigned int (*win_remap_offset)(const int win);

	void (*setup_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,

			       struct seq_file *seq, void *v);

};
@@ -728,7 +728,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus) 


static int

mvebu_mbus_default_save_cpu_target(struct mvebu_mbus_state *mbus,

				   u32 *store_addr)

				   u32 __iomem *store_addr)

{

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


static int

mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus,

				u32 *store_addr)

				u32 __iomem *store_addr)

{

	int i;
@@ -796,7 +796,7 @@ mvebu_mbus_dove_save_cpu_target(struct mvebu_mbus_state *mbus, 
	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);

}
@@ -1089,7 +1089,7 @@ static void mvebu_mbus_resume(void) 
	}

}



struct syscore_ops mvebu_mbus_syscore_ops = {

static struct syscore_ops mvebu_mbus_syscore_ops = {

	.suspend	= mvebu_mbus_suspend,

	.resume		= mvebu_mbus_resume,

};

include/linux/mbus.h

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

#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_io_aperture(struct resource *res);

int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, u8 *attr);