3 files changed, 13 insertions, 12 deletions

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index ba0bd3d5775b..9082768cc6c3 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -280,7 +280,7 @@ static int ubi_sysfs_init(struct ubi_device *ubi)
         ubi->dev.release = dev_release;
         ubi->dev.devt = ubi->cdev.dev;
         ubi->dev.class = ubi_class;
-        sprintf(&ubi->dev.bus_id[0], UBI_NAME_STR"%d", ubi->ubi_num);
+        dev_set_name(&ubi->dev, UBI_NAME_STR"%d", ubi->ubi_num);
         err = device_register(&ubi->dev);
         if (err)
                 return err;
@@ -561,7 +561,7 @@ static int io_init(struct ubi_device *ubi)
          */
 
         ubi->peb_size   = ubi->mtd->erasesize;
-        ubi->peb_count  = ubi->mtd->size / ubi->mtd->erasesize;
+        ubi->peb_count  = mtd_div_by_eb(ubi->mtd->size, ubi->mtd);
         ubi->flash_size = ubi->mtd->size;
 
         if (ubi->mtd->block_isbad && ubi->mtd->block_markbad)
diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c
index 605812bb0b1a..6dd4f5e77f82 100644
--- a/drivers/mtd/ubi/gluebi.c
+++ b/drivers/mtd/ubi/gluebi.c
@@ -215,7 +215,8 @@ static int gluebi_erase(struct mtd_info *mtd, struct erase_info *instr)
         struct ubi_volume *vol;
         struct ubi_device *ubi;
 
-        dbg_gen("erase %u bytes at offset %u", instr->len, instr->addr);
+        dbg_gen("erase %llu bytes at offset %llu", (unsigned long long)instr->len,
+                 (unsigned long long)instr->addr);
 
         if (instr->addr < 0 || instr->addr > mtd->size - mtd->erasesize)
                 return -EINVAL;
@@ -223,11 +224,11 @@ static int gluebi_erase(struct mtd_info *mtd, struct erase_info *instr)
         if (instr->len < 0 || instr->addr + instr->len > mtd->size)
                 return -EINVAL;
 
-        if (instr->addr % mtd->writesize || instr->len % mtd->writesize)
+        if (mtd_mod_by_ws(instr->addr, mtd) || mtd_mod_by_ws(instr->len, mtd))
                 return -EINVAL;
 
-        lnum = instr->addr / mtd->erasesize;
-        count = instr->len / mtd->erasesize;
+        lnum = mtd_div_by_eb(instr->addr, mtd);
+        count = mtd_div_by_eb(instr->len, mtd);
 
         vol = container_of(mtd, struct ubi_volume, gluebi_mtd);
         ubi = vol->ubi;
@@ -255,7 +256,7 @@ static int gluebi_erase(struct mtd_info *mtd, struct erase_info *instr)
 
 out_err:
         instr->state = MTD_ERASE_FAILED;
-        instr->fail_addr = lnum * mtd->erasesize;
+        instr->fail_addr = (long long)lnum * mtd->erasesize;
         return err;
 }
 
@@ -294,7 +295,7 @@ int ubi_create_gluebi(struct ubi_device *ubi, struct ubi_volume *vol)
          * bytes.
          */
         if (vol->vol_type == UBI_DYNAMIC_VOLUME)
-                mtd->size = vol->usable_leb_size * vol->reserved_pebs;
+                mtd->size = (long long)vol->usable_leb_size * vol->reserved_pebs;
         else
                 mtd->size = vol->used_bytes;
 
@@ -304,8 +305,8 @@ int ubi_create_gluebi(struct ubi_device *ubi, struct ubi_volume *vol)
                 return -ENFILE;
         }
 
-        dbg_gen("added mtd%d (\"%s\"), size %u, EB size %u",
-                mtd->index, mtd->name, mtd->size, mtd->erasesize);
+        dbg_gen("added mtd%d (\"%s\"), size %llu, EB size %u",
+                mtd->index, mtd->name, (unsigned long long)mtd->size, mtd->erasesize);
         return 0;
 }
 
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c
index 3531ca9a1e24..22e1d7398fce 100644
--- a/drivers/mtd/ubi/vmt.c
+++ b/drivers/mtd/ubi/vmt.c
@@ -329,7 +329,7 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req)
         vol->dev.devt = dev;
         vol->dev.class = ubi_class;
 
-        sprintf(&vol->dev.bus_id[0], "%s_%d", ubi->ubi_name, vol->vol_id);
+        dev_set_name(&vol->dev, "%s_%d", ubi->ubi_name, vol->vol_id);
         err = device_register(&vol->dev);
         if (err) {
                 ubi_err("cannot register device");
@@ -678,7 +678,7 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol)
         vol->dev.parent = &ubi->dev;
         vol->dev.devt = dev;
         vol->dev.class = ubi_class;
-        sprintf(&vol->dev.bus_id[0], "%s_%d", ubi->ubi_name, vol->vol_id);
+        dev_set_name(&vol->dev, "%s_%d", ubi->ubi_name, vol->vol_id);
         err = device_register(&vol->dev);
         if (err)
                 goto out_gluebi;