From: Brian Norris <computersforpeace@gmail.com>
Date: Wed, 30 Sep 2015 00:28:44 +0000 (-0700)
Subject: Revert "mtd: mtdram: check offs and len in mtdram->erase"
X-Git-Tag: v6.6-pxa1908~20144^2~129
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=d489ff42db9179647004ca2b12c614cb71ac81ea;p=linux.git

Revert "mtd: mtdram: check offs and len in mtdram->erase"

This reverts commit 7827e3acad2df1c6537e5fe7211d216dabc60399.

There are some 64-bit arithmetic issues on some architectures, so let's
wait until we get a better patch for this.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---

diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index 73fa297d81d2..8e285089229c 100644
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -32,29 +32,8 @@ MODULE_PARM_DESC(erase_size, "Device erase block size in KiB");
 // We could store these in the mtd structure, but we only support 1 device..
 static struct mtd_info *mtd_info;
 
-static int check_offs_len(struct mtd_info *mtd, loff_t ofs, uint64_t len)
-{
-	int ret = 0;
-
-	/* Start address must align on block boundary */
-	if (ofs % mtd->erasesize) {
-		pr_debug("%s: unaligned address\n", __func__);
-		ret = -EINVAL;
-	}
-
-	/* Length must align on block boundary */
-	if (len % mtd->erasesize) {
-		pr_debug("%s: length not block aligned\n", __func__);
-		ret = -EINVAL;
-	}
-
-	return ret;
-}
-
 static int ram_erase(struct mtd_info *mtd, struct erase_info *instr)
 {
-	if (check_offs_len(mtd, instr->addr, instr->len))
-		return -EINVAL;
 	memset((char *)mtd->priv + instr->addr, 0xff, instr->len);
 	instr->state = MTD_ERASE_DONE;
 	mtd_erase_callback(instr);