Skip to content

Commit

Permalink
of: remove special case definition of of_read_ulong()
Browse files Browse the repository at this point in the history
Special case of of_read_ulong() was defined for PPC32 to toss away
all but the last 32 bits when a large number value was read, and the
'normal' version for ppc64 just #defined of_read_ulong to of_read_number
which causes compiler warnings on MicroBlaze and other 32 bit
architectures because it returns a u64 instead of a ulong.

This patch fixes the problem by defining a common implementation of
of_read_ulong() that works everywhere.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Tested-by: Michal Simek <monstr@monstr.eu>
  • Loading branch information
Grant Likely committed Nov 24, 2009
1 parent 02af11b commit 2be09cb
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions include/linux/of.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,11 @@ static inline u64 of_read_number(const u32 *cell, int size)
}

/* Like of_read_number, but we want an unsigned long result */
#ifdef CONFIG_PPC32
static inline unsigned long of_read_ulong(const u32 *cell, int size)
{
return cell[size-1];
/* toss away upper bits if unsigned long is smaller than u64 */
return of_read_number(cell, size);
}
#else
#define of_read_ulong(cell, size) of_read_number(cell, size)
#endif

#include <asm/prom.h>

Expand Down

0 comments on commit 2be09cb

Please sign in to comment.