Skip to content

Commit

Permalink
[ARM] 5607/1: ep93xx: Use __iomem pointer on syscon write function
Browse files Browse the repository at this point in the history
Change the reg argument of the ep93xx_syscon_swlocked_write function
to be an __iomem pointer. Fixes a number of build warnings.

Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Ryan Mallon authored and Russell King committed Jul 17, 2009
1 parent 595c050 commit fbeeea5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-ep93xx/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ void __init ep93xx_init_irq(void)
*/
static DEFINE_SPINLOCK(syscon_swlock);

void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg)
void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg)
{
unsigned long flags;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-ep93xx/include/mach/platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void ep93xx_init_irq(void);
void ep93xx_init_time(unsigned long);

/* EP93xx System Controller software locked register write */
void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg);
void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg);
void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits);

static inline void ep93xx_devcfg_set_bits(unsigned int bits)
Expand Down

0 comments on commit fbeeea5

Please sign in to comment.