mtd: introduce mtd_write interface

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

5 files changed, 13 insertions, 13 deletions

diff --git a/drivers/mtd/tests/mtd_pagetest.c b/drivers/mtd/tests/mtd_pagetest.c
index 6d62e24a03ed..83da97e54f97 100644
--- a/drivers/mtd/tests/mtd_pagetest.c
+++ b/drivers/mtd/tests/mtd_pagetest.c
@@ -100,7 +100,7 @@ static int write_eraseblock(int ebnum)
 
         set_random_data(writebuf, mtd->erasesize);
         cond_resched();
-        err = mtd->write(mtd, addr, mtd->erasesize, &written, writebuf);
+        err = mtd_write(mtd, addr, mtd->erasesize, &written, writebuf);
         if (err || written != mtd->erasesize)
                 printk(PRINT_PREF "error: write failed at %#llx\n",
                        (long long)addr);
@@ -335,7 +335,7 @@ static int erasecrosstest(void)
         printk(PRINT_PREF "writing 1st page of block %d\n", ebnum);
         set_random_data(writebuf, pgsize);
         strcpy(writebuf, "There is no data like this!");
-        err = mtd->write(mtd, addr0, pgsize, &written, writebuf);
+        err = mtd_write(mtd, addr0, pgsize, &written, writebuf);
         if (err || written != pgsize) {
                 printk(PRINT_PREF "error: write failed at %#llx\n",
                        (long long)addr0);
@@ -368,7 +368,7 @@ static int erasecrosstest(void)
         printk(PRINT_PREF "writing 1st page of block %d\n", ebnum);
         set_random_data(writebuf, pgsize);
         strcpy(writebuf, "There is no data like this!");
-        err = mtd->write(mtd, addr0, pgsize, &written, writebuf);
+        err = mtd_write(mtd, addr0, pgsize, &written, writebuf);
         if (err || written != pgsize) {
                 printk(PRINT_PREF "error: write failed at %#llx\n",
                        (long long)addr0);
@@ -425,7 +425,7 @@ static int erasetest(void)
 
         printk(PRINT_PREF "writing 1st page of block %d\n", ebnum);
         set_random_data(writebuf, pgsize);
-        err = mtd->write(mtd, addr0, pgsize, &written, writebuf);
+        err = mtd_write(mtd, addr0, pgsize, &written, writebuf);
         if (err || written != pgsize) {
                 printk(PRINT_PREF "error: write failed at %#llx\n",
                        (long long)addr0);
diff --git a/drivers/mtd/tests/mtd_speedtest.c b/drivers/mtd/tests/mtd_speedtest.c
index 3c9529bd0a62..c7b18e189082 100644
--- a/drivers/mtd/tests/mtd_speedtest.c
+++ b/drivers/mtd/tests/mtd_speedtest.c
@@ -143,7 +143,7 @@ static int write_eraseblock(int ebnum)
         int err = 0;
         loff_t addr = ebnum * mtd->erasesize;
 
-        err = mtd->write(mtd, addr, mtd->erasesize, &written, iobuf);
+        err = mtd_write(mtd, addr, mtd->erasesize, &written, iobuf);
         if (err || written != mtd->erasesize) {
                 printk(PRINT_PREF "error: write failed at %#llx\n", addr);
                 if (!err)
@@ -161,7 +161,7 @@ static int write_eraseblock_by_page(int ebnum)
         void *buf = iobuf;
 
         for (i = 0; i < pgcnt; i++) {
-                err = mtd->write(mtd, addr, pgsize, &written, buf);
+                err = mtd_write(mtd, addr, pgsize, &written, buf);
                 if (err || written != pgsize) {
                         printk(PRINT_PREF "error: write failed at %#llx\n",
                                addr);
@@ -184,7 +184,7 @@ static int write_eraseblock_by_2pages(int ebnum)
         void *buf = iobuf;
 
         for (i = 0; i < n; i++) {
-                err = mtd->write(mtd, addr, sz, &written, buf);
+                err = mtd_write(mtd, addr, sz, &written, buf);
                 if (err || written != sz) {
                         printk(PRINT_PREF "error: write failed at %#llx\n",
                                addr);
@@ -196,7 +196,7 @@ static int write_eraseblock_by_2pages(int ebnum)
                 buf += sz;
         }
         if (pgcnt % 2) {
-                err = mtd->write(mtd, addr, pgsize, &written, buf);
+                err = mtd_write(mtd, addr, pgsize, &written, buf);
                 if (err || written != pgsize) {
                         printk(PRINT_PREF "error: write failed at %#llx\n",
                                addr);
diff --git a/drivers/mtd/tests/mtd_stresstest.c b/drivers/mtd/tests/mtd_stresstest.c
index 83a843723880..f8aac4b7e59a 100644
--- a/drivers/mtd/tests/mtd_stresstest.c
+++ b/drivers/mtd/tests/mtd_stresstest.c
@@ -192,7 +192,7 @@ static int do_write(void)
                 }
         }
         addr = eb * mtd->erasesize + offs;
-        err = mtd->write(mtd, addr, len, &written, writebuf);
+        err = mtd_write(mtd, addr, len, &written, writebuf);
         if (unlikely(err || written != len)) {
                 printk(PRINT_PREF "error: write failed at 0x%llx\n",
                        (long long)addr);
diff --git a/drivers/mtd/tests/mtd_subpagetest.c b/drivers/mtd/tests/mtd_subpagetest.c
index d81f89a19daa..b90c01036b49 100644
--- a/drivers/mtd/tests/mtd_subpagetest.c
+++ b/drivers/mtd/tests/mtd_subpagetest.c
@@ -120,7 +120,7 @@ static int write_eraseblock(int ebnum)
         loff_t addr = ebnum * mtd->erasesize;
 
         set_random_data(writebuf, subpgsize);
-        err = mtd->write(mtd, addr, subpgsize, &written, writebuf);
+        err = mtd_write(mtd, addr, subpgsize, &written, writebuf);
         if (unlikely(err || written != subpgsize)) {
                 printk(PRINT_PREF "error: write failed at %#llx\n",
                        (long long)addr);
@@ -134,7 +134,7 @@ static int write_eraseblock(int ebnum)
         addr += subpgsize;
 
         set_random_data(writebuf, subpgsize);
-        err = mtd->write(mtd, addr, subpgsize, &written, writebuf);
+        err = mtd_write(mtd, addr, subpgsize, &written, writebuf);
         if (unlikely(err || written != subpgsize)) {
                 printk(PRINT_PREF "error: write failed at %#llx\n",
                        (long long)addr);
@@ -158,7 +158,7 @@ static int write_eraseblock2(int ebnum)
                 if (addr + (subpgsize * k) > (ebnum + 1) * mtd->erasesize)
                         break;
                 set_random_data(writebuf, subpgsize * k);
-                err = mtd->write(mtd, addr, subpgsize * k, &written, writebuf);
+                err = mtd_write(mtd, addr, subpgsize * k, &written, writebuf);
                 if (unlikely(err || written != subpgsize * k)) {
                         printk(PRINT_PREF "error: write failed at %#llx\n",
                                (long long)addr);
diff --git a/drivers/mtd/tests/mtd_torturetest.c b/drivers/mtd/tests/mtd_torturetest.c
index ecc68bf3f3f2..dd34a519fa7a 100644
--- a/drivers/mtd/tests/mtd_torturetest.c
+++ b/drivers/mtd/tests/mtd_torturetest.c
@@ -189,7 +189,7 @@ static inline int write_pattern(int ebnum, void *buf)
                 addr = (ebnum + 1) * mtd->erasesize - pgcnt * pgsize;
                 len = pgcnt * pgsize;
         }
-        err = mtd->write(mtd, addr, len, &written, buf);
+        err = mtd_write(mtd, addr, len, &written, buf);
         if (err) {
                 printk(PRINT_PREF "error %d while writing EB %d, written %zd"
                       " bytes\n", err, ebnum, written);