diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2013-05-07 19:18:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 21:38:27 -0400 |
commit | 50bea5c0d583e255e3d8a193f8b20e177bac8ec8 (patch) | |
tree | b2d71f94a5caf90c4f3d71bf9aac95d27f19e2d6 | |
parent | e00adf39134028d65023c327b427074728c18f7e (diff) |
drivers/infiniband/hw: rename random32() to prandom_u32()
Use preferable function name which implies using a pseudo-random number
generator.
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/infiniband/hw/cxgb3/cxio_resource.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/hw/cxgb4/id_table.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/hw/mlx4/mad.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/cxgb3/cxio_resource.c b/drivers/infiniband/hw/cxgb3/cxio_resource.c index 31f9201b2980..c40088ecf9f3 100644 --- a/drivers/infiniband/hw/cxgb3/cxio_resource.c +++ b/drivers/infiniband/hw/cxgb3/cxio_resource.c | |||
@@ -62,13 +62,13 @@ static int __cxio_init_resource_fifo(struct kfifo *fifo, | |||
62 | kfifo_in(fifo, (unsigned char *) &entry, sizeof(u32)); | 62 | kfifo_in(fifo, (unsigned char *) &entry, sizeof(u32)); |
63 | if (random) { | 63 | if (random) { |
64 | j = 0; | 64 | j = 0; |
65 | random_bytes = random32(); | 65 | random_bytes = prandom_u32(); |
66 | for (i = 0; i < RANDOM_SIZE; i++) | 66 | for (i = 0; i < RANDOM_SIZE; i++) |
67 | rarray[i] = i + skip_low; | 67 | rarray[i] = i + skip_low; |
68 | for (i = skip_low + RANDOM_SIZE; i < nr - skip_high; i++) { | 68 | for (i = skip_low + RANDOM_SIZE; i < nr - skip_high; i++) { |
69 | if (j >= RANDOM_SIZE) { | 69 | if (j >= RANDOM_SIZE) { |
70 | j = 0; | 70 | j = 0; |
71 | random_bytes = random32(); | 71 | random_bytes = prandom_u32(); |
72 | } | 72 | } |
73 | idx = (random_bytes >> (j * 2)) & 0xF; | 73 | idx = (random_bytes >> (j * 2)) & 0xF; |
74 | kfifo_in(fifo, | 74 | kfifo_in(fifo, |
diff --git a/drivers/infiniband/hw/cxgb4/id_table.c b/drivers/infiniband/hw/cxgb4/id_table.c index f95e5df30db2..0161ae6ad629 100644 --- a/drivers/infiniband/hw/cxgb4/id_table.c +++ b/drivers/infiniband/hw/cxgb4/id_table.c | |||
@@ -54,7 +54,7 @@ u32 c4iw_id_alloc(struct c4iw_id_table *alloc) | |||
54 | 54 | ||
55 | if (obj < alloc->max) { | 55 | if (obj < alloc->max) { |
56 | if (alloc->flags & C4IW_ID_TABLE_F_RANDOM) | 56 | if (alloc->flags & C4IW_ID_TABLE_F_RANDOM) |
57 | alloc->last += random32() % RANDOM_SKIP; | 57 | alloc->last += prandom_u32() % RANDOM_SKIP; |
58 | else | 58 | else |
59 | alloc->last = obj + 1; | 59 | alloc->last = obj + 1; |
60 | if (alloc->last >= alloc->max) | 60 | if (alloc->last >= alloc->max) |
@@ -88,7 +88,7 @@ int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num, | |||
88 | alloc->start = start; | 88 | alloc->start = start; |
89 | alloc->flags = flags; | 89 | alloc->flags = flags; |
90 | if (flags & C4IW_ID_TABLE_F_RANDOM) | 90 | if (flags & C4IW_ID_TABLE_F_RANDOM) |
91 | alloc->last = random32() % RANDOM_SKIP; | 91 | alloc->last = prandom_u32() % RANDOM_SKIP; |
92 | else | 92 | else |
93 | alloc->last = 0; | 93 | alloc->last = 0; |
94 | alloc->max = num; | 94 | alloc->max = num; |
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index 934792c477bc..4d599cedbb0b 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c | |||
@@ -93,7 +93,7 @@ static void __propagate_pkey_ev(struct mlx4_ib_dev *dev, int port_num, | |||
93 | __be64 mlx4_ib_gen_node_guid(void) | 93 | __be64 mlx4_ib_gen_node_guid(void) |
94 | { | 94 | { |
95 | #define NODE_GUID_HI ((u64) (((u64)IB_OPENIB_OUI) << 40)) | 95 | #define NODE_GUID_HI ((u64) (((u64)IB_OPENIB_OUI) << 40)) |
96 | return cpu_to_be64(NODE_GUID_HI | random32()); | 96 | return cpu_to_be64(NODE_GUID_HI | prandom_u32()); |
97 | } | 97 | } |
98 | 98 | ||
99 | __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx) | 99 | __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx) |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 1ef880de3a41..3eceb61e3532 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c | |||
@@ -460,7 +460,7 @@ static int ipoib_cm_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *even | |||
460 | goto err_qp; | 460 | goto err_qp; |
461 | } | 461 | } |
462 | 462 | ||
463 | psn = random32() & 0xffffff; | 463 | psn = prandom_u32() & 0xffffff; |
464 | ret = ipoib_cm_modify_rx_qp(dev, cm_id, p->qp, psn); | 464 | ret = ipoib_cm_modify_rx_qp(dev, cm_id, p->qp, psn); |
465 | if (ret) | 465 | if (ret) |
466 | goto err_modify; | 466 | goto err_modify; |