Skip to content

Commit

Permalink
mtd: rename random32() to prandom_u32()
Browse files Browse the repository at this point in the history
Use more preferable function name which implies using a pseudo-random
number generator.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
  • Loading branch information
Akinobu Mita authored and Artem Bityutskiy committed Feb 4, 2013
1 parent bd6ce5e commit aca662a
Showing 4 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions drivers/mtd/nand/nandsim.c
Original file line number Diff line number Diff line change
@@ -1476,12 +1476,12 @@ int do_read_error(struct nandsim *ns, int num)

void do_bit_flips(struct nandsim *ns, int num)
{
if (bitflips && random32() < (1 << 22)) {
if (bitflips && prandom_u32() < (1 << 22)) {
int flips = 1;
if (bitflips > 1)
flips = (random32() % (int) bitflips) + 1;
flips = (prandom_u32() % (int) bitflips) + 1;
while (flips--) {
int pos = random32() % (num * 8);
int pos = prandom_u32() % (num * 8);
ns->buf.byte[pos / 8] ^= (1 << (pos % 8));
NS_WARN("read_page: flipping bit %d in page %d "
"reading from %d ecc: corrected=%u failed=%u\n",
10 changes: 5 additions & 5 deletions drivers/mtd/tests/mtd_nandecctest.c
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ struct nand_ecc_test {
static void single_bit_error_data(void *error_data, void *correct_data,
size_t size)
{
unsigned int offset = random32() % (size * BITS_PER_BYTE);
unsigned int offset = prandom_u32() % (size * BITS_PER_BYTE);

memcpy(error_data, correct_data, size);
__change_bit_le(offset, error_data);
@@ -55,9 +55,9 @@ static void double_bit_error_data(void *error_data, void *correct_data,
{
unsigned int offset[2];

offset[0] = random32() % (size * BITS_PER_BYTE);
offset[0] = prandom_u32() % (size * BITS_PER_BYTE);
do {
offset[1] = random32() % (size * BITS_PER_BYTE);
offset[1] = prandom_u32() % (size * BITS_PER_BYTE);
} while (offset[0] == offset[1]);

memcpy(error_data, correct_data, size);
@@ -68,15 +68,15 @@ static void double_bit_error_data(void *error_data, void *correct_data,

static unsigned int random_ecc_bit(size_t size)
{
unsigned int offset = random32() % (3 * BITS_PER_BYTE);
unsigned int offset = prandom_u32() % (3 * BITS_PER_BYTE);

if (size == 256) {
/*
* Don't inject a bit error into the insignificant bits (16th
* and 17th bit) in ECC code for 256 byte data block
*/
while (offset == 16 || offset == 17)
offset = random32() % (3 * BITS_PER_BYTE);
offset = prandom_u32() % (3 * BITS_PER_BYTE);
}

return offset;
8 changes: 4 additions & 4 deletions drivers/mtd/tests/mtd_stresstest.c
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ static int rand_eb(void)
unsigned int eb;

again:
eb = random32();
eb = prandom_u32();
/* Read or write up 2 eraseblocks at a time - hence 'ebcnt - 1' */
eb %= (ebcnt - 1);
if (bbt[eb])
@@ -67,7 +67,7 @@ static int rand_offs(void)
{
unsigned int offs;

offs = random32();
offs = prandom_u32();
offs %= bufsize;
return offs;
}
@@ -76,7 +76,7 @@ static int rand_len(int offs)
{
unsigned int len;

len = random32();
len = prandom_u32();
len %= (bufsize - offs);
return len;
}
@@ -191,7 +191,7 @@ static int do_write(void)

static int do_operation(void)
{
if (random32() & 1)
if (prandom_u32() & 1)
return do_read();
else
return do_write();
6 changes: 3 additions & 3 deletions drivers/mtd/ubi/debug.h
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ static inline int ubi_dbg_is_bgt_disabled(const struct ubi_device *ubi)
static inline int ubi_dbg_is_bitflip(const struct ubi_device *ubi)
{
if (ubi->dbg.emulate_bitflips)
return !(random32() % 200);
return !(prandom_u32() % 200);
return 0;
}

@@ -100,7 +100,7 @@ static inline int ubi_dbg_is_bitflip(const struct ubi_device *ubi)
static inline int ubi_dbg_is_write_failure(const struct ubi_device *ubi)
{
if (ubi->dbg.emulate_io_failures)
return !(random32() % 500);
return !(prandom_u32() % 500);
return 0;
}

@@ -114,7 +114,7 @@ static inline int ubi_dbg_is_write_failure(const struct ubi_device *ubi)
static inline int ubi_dbg_is_erase_failure(const struct ubi_device *ubi)
{
if (ubi->dbg.emulate_io_failures)
return !(random32() % 400);
return !(prandom_u32() % 400);
return 0;
}

0 comments on commit aca662a

Please sign in to comment.