[PATCH 7/7] lib/random32.c: Remove redundant U suffixes on integers

George Spelvin
2014-06-07T08:31:23Z

Get rid of a few of the extraneous U suffixes on ordinary integers.

Signed-off-by: George Spelvin <linux@horizon.com>
---
lib/random32.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/random32.c b/lib/random32.c
index 9cc410dd..ad0c2ed1 100644
--- a/lib/random32.c
+++ b/lib/random32.c
@@ -58,10 +58,10 @@ u32 prandom_u32_state(struct rnd_state *state)
{
#define TAUSWORTHE(s,a,b,c,d) ((s&c)<<d) ^ (((s <<a) ^ s)>>b)

- state->s1 = TAUSWORTHE(state->s1, 6U, 13U, 4294967294U, 18U);
- state->s2 = TAUSWORTHE(state->s2, 2U, 27U, 4294967288U, 2U);
- state->s3 = TAUSWORTHE(state->s3, 13U, 21U, 4294967280U, 7U);
- state->s4 = TAUSWORTHE(state->s4, 3U, 12U, 4294967168U, 13U);
+ state->s1 = TAUSWORTHE(state->s1, 6, 13, 4294967294U, 18);
+ state->s2 = TAUSWORTHE(state->s2, 2, 27, 4294967288U, 2);
+ state->s3 = TAUSWORTHE(state->s3, 13, 21, 4294967280U, 7);
+ state->s4 = TAUSWORTHE(state->s4, 3, 12, 4294967168U, 13);

return (state->s1 ^ state->s2 ^ state->s3 ^ state->s4);
}
@@ -77,9 +77,8 @@ EXPORT_SYMBOL(prandom_u32_state);
u32 prandom_u32(void)
{
struct rnd_state *state = &get_cpu_var(net_rand_state);
- u32 res;
+ u32 res = prandom_u32_state(state);

- res = prandom_u32_state(state);
put_cpu_var(state);

return res;
--
2.0.0