mtd: introduce mtd_read interface

[mv-sheeva.git] / drivers / staging / spectra / lld_mtd.c

diff --git a/drivers/staging/spectra/lld_mtd.c b/drivers/staging/spectra/lld_mtd.c
index 2bd34662beb5bea4e8606bbc3dcaf20f64d4b6f6..eccd08d0e00943a7a08a9398d35df657471b4aff 100644 (file)
--- a/drivers/staging/spectra/lld_mtd.c
+++ b/drivers/staging/spectra/lld_mtd.c
@@ -188,7 +188,7 @@ u16 mtd_Erase_Block(u32 block_add)
        erase.len = spectra_mtd->erasesize;
        erase.priv = (unsigned long)∁
 
-       ret = spectra_mtd->erase(spectra_mtd, &erase);
+       ret = mtd_erase(spectra_mtd, &erase);
        if (!ret) {
                wait_for_completion(&comp);
                if (erase.state != MTD_ERASE_DONE)
@@ -283,9 +283,11 @@ u16 mtd_Read_Page_Main(u8 *read_data, u32 Block,
 
 
        while (PageCount) {
-               ret = spectra_mtd->read(spectra_mtd,
-                                       (Block * spectra_mtd->erasesize) + (Page * spectra_mtd->writesize),
-                                       DeviceInfo.wPageDataSize, &retlen, read_data);
+               ret = mtd_read(spectra_mtd,
+                              (Block * spectra_mtd->erasesize) + (Page * spectra_mtd->writesize),
+                              DeviceInfo.wPageDataSize,
+                              &retlen,
+                              read_data);
                if (ret) {
                        printk(KERN_ERR "%s failed %d\n", __func__, ret);
                        return FAIL;
@@ -340,7 +342,7 @@ u16 mtd_Read_Page_Main_Spare(u8 *read_data, u32 Block,
                struct mtd_oob_ops ops;
                int ret;
 
-               ops.mode = MTD_OOB_AUTO;
+               ops.mode = MTD_OPS_AUTO_OOB;
                ops.datbuf = read_data;
                ops.len = DeviceInfo.wPageDataSize;
                ops.oobbuf = read_data + DeviceInfo.wPageDataSize + BTSIG_OFFSET;
@@ -400,7 +402,7 @@ u16 mtd_Write_Page_Main_Spare(u8 *write_data, u32 Block,
                struct mtd_oob_ops ops;
                int ret;
 
-               ops.mode = MTD_OOB_AUTO;
+               ops.mode = MTD_OPS_AUTO_OOB;
                ops.datbuf = write_data;
                ops.len = DeviceInfo.wPageDataSize;
                ops.oobbuf = write_data + DeviceInfo.wPageDataSize + BTSIG_OFFSET;
@@ -473,7 +475,7 @@ u16 mtd_Read_Page_Spare(u8 *read_data, u32 Block,
                struct mtd_oob_ops ops;
                int ret;
 
-               ops.mode = MTD_OOB_AUTO;
+               ops.mode = MTD_OPS_AUTO_OOB;
                ops.datbuf = NULL;
                ops.len = 0;
                ops.oobbuf = read_data;