hwrng: octeon - Fix warnings on 32-bit platforms

Use unsigned long instead of u64 to silence compile warnings on
32-bit platforms.  Also remove the __force bit which seems no
longer needed with a current sparse.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/char/hw_random/octeon-rng.c b/drivers/char/hw_random/octeon-rng.c
index 8561a09b46814eec46c410f62e98cd334bb8b974..412f544050364d6d76a1d502db6ec65a7e66daa8 100644 (file)
--- a/drivers/char/hw_random/octeon-rng.c
+++ b/drivers/char/hw_random/octeon-rng.c
@@ -33,7 +33,7 @@ static int octeon_rng_init(struct hwrng *rng)
        ctl.u64 = 0;
        ctl.s.ent_en = 1; /* Enable the entropy source.  */
        ctl.s.rng_en = 1; /* Enable the RNG hardware.  */
-       cvmx_write_csr((__force u64)p->control_status, ctl.u64);
+       cvmx_write_csr((unsigned long)p->control_status, ctl.u64);
        return 0;
 }
 
@@ -44,14 +44,14 @@ static void octeon_rng_cleanup(struct hwrng *rng)
 
        ctl.u64 = 0;
        /* Disable everything.  */
-       cvmx_write_csr((__force u64)p->control_status, ctl.u64);
+       cvmx_write_csr((unsigned long)p->control_status, ctl.u64);
 }
 
 static int octeon_rng_data_read(struct hwrng *rng, u32 *data)
 {
        struct octeon_rng *p = container_of(rng, struct octeon_rng, ops);
 
-       *data = cvmx_read64_uint32((__force u64)p->result);
+       *data = cvmx_read64_uint32((unsigned long)p->result);
        return sizeof(u32);
 }