Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+3 -3
+3 -3
drivers/char/hw_random/octeon-rng.c
··· 33 33 ctl.u64 = 0; 34 34 ctl.s.ent_en = 1; /* Enable the entropy source. */ 35 35 ctl.s.rng_en = 1; /* Enable the RNG hardware. */ 36 - cvmx_write_csr((__force u64)p->control_status, ctl.u64); 36 + cvmx_write_csr((unsigned long)p->control_status, ctl.u64); 37 37 return 0; 38 38 } 39 39 ··· 44 44 45 45 ctl.u64 = 0; 46 46 /* Disable everything. */ 47 - cvmx_write_csr((__force u64)p->control_status, ctl.u64); 47 + cvmx_write_csr((unsigned long)p->control_status, ctl.u64); 48 48 } 49 49 50 50 static int octeon_rng_data_read(struct hwrng *rng, u32 *data) 51 51 { 52 52 struct octeon_rng *p = container_of(rng, struct octeon_rng, ops); 53 53 54 - *data = cvmx_read64_uint32((__force u64)p->result); 54 + *data = cvmx_read64_uint32((unsigned long)p->result); 55 55 return sizeof(u32); 56 56 } 57 57