diff options
Diffstat (limited to 'drivers/mtd/tests/speedtest.c')
-rw-r--r-- | drivers/mtd/tests/speedtest.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/drivers/mtd/tests/speedtest.c b/drivers/mtd/tests/speedtest.c index d1a38530612e..87ff6a29f84e 100644 --- a/drivers/mtd/tests/speedtest.c +++ b/drivers/mtd/tests/speedtest.c | |||
@@ -80,14 +80,9 @@ static int multiblock_erase(int ebnum, int blocks) | |||
80 | 80 | ||
81 | static int write_eraseblock(int ebnum) | 81 | static int write_eraseblock(int ebnum) |
82 | { | 82 | { |
83 | int err; | ||
84 | loff_t addr = ebnum * mtd->erasesize; | 83 | loff_t addr = ebnum * mtd->erasesize; |
85 | 84 | ||
86 | err = mtdtest_write(mtd, addr, mtd->erasesize, iobuf); | 85 | return mtdtest_write(mtd, addr, mtd->erasesize, iobuf); |
87 | if (err) | ||
88 | pr_err("error: write failed at %#llx\n", addr); | ||
89 | |||
90 | return err; | ||
91 | } | 86 | } |
92 | 87 | ||
93 | static int write_eraseblock_by_page(int ebnum) | 88 | static int write_eraseblock_by_page(int ebnum) |
@@ -98,11 +93,8 @@ static int write_eraseblock_by_page(int ebnum) | |||
98 | 93 | ||
99 | for (i = 0; i < pgcnt; i++) { | 94 | for (i = 0; i < pgcnt; i++) { |
100 | err = mtdtest_write(mtd, addr, pgsize, buf); | 95 | err = mtdtest_write(mtd, addr, pgsize, buf); |
101 | if (err) { | 96 | if (err) |
102 | pr_err("error: write failed at %#llx\n", | ||
103 | addr); | ||
104 | break; | 97 | break; |
105 | } | ||
106 | addr += pgsize; | 98 | addr += pgsize; |
107 | buf += pgsize; | 99 | buf += pgsize; |
108 | } | 100 | } |
@@ -119,21 +111,13 @@ static int write_eraseblock_by_2pages(int ebnum) | |||
119 | 111 | ||
120 | for (i = 0; i < n; i++) { | 112 | for (i = 0; i < n; i++) { |
121 | err = mtdtest_write(mtd, addr, sz, buf); | 113 | err = mtdtest_write(mtd, addr, sz, buf); |
122 | if (err) { | 114 | if (err) |
123 | pr_err("error: write failed at %#llx\n", | ||
124 | addr); | ||
125 | return err; | 115 | return err; |
126 | } | ||
127 | addr += sz; | 116 | addr += sz; |
128 | buf += sz; | 117 | buf += sz; |
129 | } | 118 | } |
130 | if (pgcnt % 2) { | 119 | if (pgcnt % 2) |
131 | err = mtdtest_write(mtd, addr, pgsize, buf); | 120 | err = mtdtest_write(mtd, addr, pgsize, buf); |
132 | if (err) { | ||
133 | pr_err("error: write failed at %#llx\n", | ||
134 | addr); | ||
135 | } | ||
136 | } | ||
137 | 121 | ||
138 | return err; | 122 | return err; |
139 | } | 123 | } |