Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 282894
b: refs/heads/master
c: 30fa984
h: refs/heads/master
v: v3
  • Loading branch information
Artem Bityutskiy authored and David Woodhouse committed Jan 9, 2012
1 parent 3e2bea6 commit 6b772ce
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 34 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9cf075f8656524abc44ad3ff2ec3834fe76f186f
refs/heads/master: 30fa98480b782999248ce8290136aa58f22536cf
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/mtdchar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static ssize_t mtdchar_read(struct file *file, char __user *buf, size_t count,
{
struct mtd_file_info *mfi = file->private_data;
struct mtd_info *mtd = mfi->mtd;
size_t retlen=0;
size_t retlen;
size_t total_retlen=0;
int ret=0;
int len;
Expand Down
17 changes: 5 additions & 12 deletions trunk/drivers/mtd/tests/mtd_pagetest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ static int erase_eraseblock(int ebnum)
static int write_eraseblock(int ebnum)
{
int err = 0;
size_t written = 0;
size_t written;
loff_t addr = ebnum * mtd->erasesize;

set_random_data(writebuf, mtd->erasesize);
Expand All @@ -111,7 +111,7 @@ static int write_eraseblock(int ebnum)
static int verify_eraseblock(int ebnum)
{
uint32_t j;
size_t read = 0;
size_t read;
int err = 0, i;
loff_t addr0, addrn;
loff_t addr = ebnum * mtd->erasesize;
Expand Down Expand Up @@ -144,7 +144,6 @@ static int verify_eraseblock(int ebnum)
return err;
}
memset(twopages, 0, bufsize);
read = 0;
err = mtd_read(mtd, addr, bufsize, &read, twopages);
if (mtd_is_bitflip(err))
err = 0;
Expand Down Expand Up @@ -180,7 +179,6 @@ static int verify_eraseblock(int ebnum)
return err;
}
memset(twopages, 0, bufsize);
read = 0;
err = mtd_read(mtd, addr, bufsize, &read, twopages);
if (mtd_is_bitflip(err))
err = 0;
Expand All @@ -203,7 +201,7 @@ static int verify_eraseblock(int ebnum)

static int crosstest(void)
{
size_t read = 0;
size_t read;
int err = 0, i;
loff_t addr, addr0, addrn;
unsigned char *pp1, *pp2, *pp3, *pp4;
Expand All @@ -228,7 +226,6 @@ static int crosstest(void)
addrn -= mtd->erasesize;

/* Read 2nd-to-last page to pp1 */
read = 0;
addr = addrn - pgsize - pgsize;
err = mtd_read(mtd, addr, pgsize, &read, pp1);
if (mtd_is_bitflip(err))
Expand All @@ -241,7 +238,6 @@ static int crosstest(void)
}

/* Read 3rd-to-last page to pp1 */
read = 0;
addr = addrn - pgsize - pgsize - pgsize;
err = mtd_read(mtd, addr, pgsize, &read, pp1);
if (mtd_is_bitflip(err))
Expand All @@ -254,7 +250,6 @@ static int crosstest(void)
}

/* Read first page to pp2 */
read = 0;
addr = addr0;
printk(PRINT_PREF "reading page at %#llx\n", (long long)addr);
err = mtd_read(mtd, addr, pgsize, &read, pp2);
Expand All @@ -268,7 +263,6 @@ static int crosstest(void)
}

/* Read last page to pp3 */
read = 0;
addr = addrn - pgsize;
printk(PRINT_PREF "reading page at %#llx\n", (long long)addr);
err = mtd_read(mtd, addr, pgsize, &read, pp3);
Expand All @@ -282,7 +276,6 @@ static int crosstest(void)
}

/* Read first page again to pp4 */
read = 0;
addr = addr0;
printk(PRINT_PREF "reading page at %#llx\n", (long long)addr);
err = mtd_read(mtd, addr, pgsize, &read, pp4);
Expand All @@ -309,7 +302,7 @@ static int crosstest(void)

static int erasecrosstest(void)
{
size_t read = 0, written = 0;
size_t read, written;
int err = 0, i, ebnum, ebnum2;
loff_t addr0;
char *readbuf = twopages;
Expand Down Expand Up @@ -405,7 +398,7 @@ static int erasecrosstest(void)

static int erasetest(void)
{
size_t read = 0, written = 0;
size_t read, written;
int err = 0, i, ebnum, ok = 1;
loff_t addr0;

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/tests/mtd_readtest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static int pgcnt;

static int read_eraseblock_by_page(int ebnum)
{
size_t read = 0;
size_t read;
int i, ret, err = 0;
loff_t addr = ebnum * mtd->erasesize;
void *buf = iobuf;
Expand Down
12 changes: 6 additions & 6 deletions trunk/drivers/mtd/tests/mtd_speedtest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static int erase_whole_device(void)

static int write_eraseblock(int ebnum)
{
size_t written = 0;
size_t written;
int err = 0;
loff_t addr = ebnum * mtd->erasesize;

Expand All @@ -155,7 +155,7 @@ static int write_eraseblock(int ebnum)

static int write_eraseblock_by_page(int ebnum)
{
size_t written = 0;
size_t written;
int i, err = 0;
loff_t addr = ebnum * mtd->erasesize;
void *buf = iobuf;
Expand All @@ -178,7 +178,7 @@ static int write_eraseblock_by_page(int ebnum)

static int write_eraseblock_by_2pages(int ebnum)
{
size_t written = 0, sz = pgsize * 2;
size_t written, sz = pgsize * 2;
int i, n = pgcnt / 2, err = 0;
loff_t addr = ebnum * mtd->erasesize;
void *buf = iobuf;
Expand Down Expand Up @@ -210,7 +210,7 @@ static int write_eraseblock_by_2pages(int ebnum)

static int read_eraseblock(int ebnum)
{
size_t read = 0;
size_t read;
int err = 0;
loff_t addr = ebnum * mtd->erasesize;

Expand All @@ -229,7 +229,7 @@ static int read_eraseblock(int ebnum)

static int read_eraseblock_by_page(int ebnum)
{
size_t read = 0;
size_t read;
int i, err = 0;
loff_t addr = ebnum * mtd->erasesize;
void *buf = iobuf;
Expand All @@ -255,7 +255,7 @@ static int read_eraseblock_by_page(int ebnum)

static int read_eraseblock_by_2pages(int ebnum)
{
size_t read = 0, sz = pgsize * 2;
size_t read, sz = pgsize * 2;
int i, n = pgcnt / 2, err = 0;
loff_t addr = ebnum * mtd->erasesize;
void *buf = iobuf;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/mtd/tests/mtd_stresstest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static int is_block_bad(int ebnum)

static int do_read(void)
{
size_t read = 0;
size_t read;
int eb = rand_eb();
int offs = rand_offs();
int len = rand_len(offs), err;
Expand Down Expand Up @@ -169,7 +169,7 @@ static int do_read(void)
static int do_write(void)
{
int eb = rand_eb(), offs, err, len;
size_t written = 0;
size_t written;
loff_t addr;

offs = offsets[eb];
Expand Down
14 changes: 5 additions & 9 deletions trunk/drivers/mtd/tests/mtd_subpagetest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ static int erase_whole_device(void)

static int write_eraseblock(int ebnum)
{
size_t written = 0;
size_t written;
int err = 0;
loff_t addr = ebnum * mtd->erasesize;

Expand Down Expand Up @@ -150,7 +150,7 @@ static int write_eraseblock(int ebnum)

static int write_eraseblock2(int ebnum)
{
size_t written = 0;
size_t written;
int err = 0, k;
loff_t addr = ebnum * mtd->erasesize;

Expand Down Expand Up @@ -189,13 +189,12 @@ static void print_subpage(unsigned char *p)

static int verify_eraseblock(int ebnum)
{
size_t read = 0;
size_t read;
int err = 0;
loff_t addr = ebnum * mtd->erasesize;

set_random_data(writebuf, subpgsize);
clear_data(readbuf, subpgsize);
read = 0;
err = mtd_read(mtd, addr, subpgsize, &read, readbuf);
if (unlikely(err || read != subpgsize)) {
if (mtd_is_bitflip(err) && read == subpgsize) {
Expand Down Expand Up @@ -223,7 +222,6 @@ static int verify_eraseblock(int ebnum)

set_random_data(writebuf, subpgsize);
clear_data(readbuf, subpgsize);
read = 0;
err = mtd_read(mtd, addr, subpgsize, &read, readbuf);
if (unlikely(err || read != subpgsize)) {
if (mtd_is_bitflip(err) && read == subpgsize) {
Expand Down Expand Up @@ -252,7 +250,7 @@ static int verify_eraseblock(int ebnum)

static int verify_eraseblock2(int ebnum)
{
size_t read = 0;
size_t read;
int err = 0, k;
loff_t addr = ebnum * mtd->erasesize;

Expand All @@ -261,7 +259,6 @@ static int verify_eraseblock2(int ebnum)
break;
set_random_data(writebuf, subpgsize * k);
clear_data(readbuf, subpgsize * k);
read = 0;
err = mtd_read(mtd, addr, subpgsize * k, &read, readbuf);
if (unlikely(err || read != subpgsize * k)) {
if (mtd_is_bitflip(err) && read == subpgsize * k) {
Expand All @@ -288,14 +285,13 @@ static int verify_eraseblock2(int ebnum)
static int verify_eraseblock_ff(int ebnum)
{
uint32_t j;
size_t read = 0;
size_t read;
int err = 0;
loff_t addr = ebnum * mtd->erasesize;

memset(writebuf, 0xff, subpgsize);
for (j = 0; j < mtd->erasesize / subpgsize; ++j) {
clear_data(readbuf, subpgsize);
read = 0;
err = mtd_read(mtd, addr, subpgsize, &read, readbuf);
if (unlikely(err || read != subpgsize)) {
if (mtd_is_bitflip(err) && read == subpgsize) {
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/mtd/tests/mtd_torturetest.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static inline int erase_eraseblock(int ebnum)
static inline int check_eraseblock(int ebnum, unsigned char *buf)
{
int err, retries = 0;
size_t read = 0;
size_t read;
loff_t addr = ebnum * mtd->erasesize;
size_t len = mtd->erasesize;

Expand Down Expand Up @@ -181,7 +181,7 @@ static inline int check_eraseblock(int ebnum, unsigned char *buf)
static inline int write_pattern(int ebnum, void *buf)
{
int err;
size_t written = 0;
size_t written;
loff_t addr = ebnum * mtd->erasesize;
size_t len = mtd->erasesize;

Expand Down

0 comments on commit 6b772ce

Please sign in to comment.