Patchwork [06/10] nandwrite: kill more MEMSETOOBSEL

login
register
mail settings
Submitter Brian Norris
Date Aug. 19, 2011, 5:07 p.m.
Message ID <1313773676-12879-7-git-send-email-computersforpeace@gmail.com>
Download mbox | patch
Permalink /patch/110709/
State Accepted
Commit 40a989d1ae5b18f68f43de739c8e15fa6734a9e2
Headers show

Comments

Brian Norris - Aug. 19, 2011, 5:07 p.m.
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
 nandwrite.c |   26 +-------------------------
 1 files changed, 1 insertions(+), 25 deletions(-)

Patch

diff --git a/nandwrite.c b/nandwrite.c
index 2700975..22e9b7f 100644
--- a/nandwrite.c
+++ b/nandwrite.c
@@ -44,10 +44,6 @@ 
 #include <libmtd.h>
 
 // oob layouts to pass into the kernel as default
-static struct nand_oobinfo none_oobinfo = {
-	.useecc = MTD_NANDECC_OFF,
-};
-
 static struct nand_oobinfo jffs2_oobinfo = {
 	.useecc = MTD_NANDECC_PLACE,
 	.eccbytes = 6,
@@ -318,18 +314,7 @@  int main(int argc, char * const argv[])
 		} else {
 			switch (errno) {
 			case ENOTTY:
-				if (ioctl(fd, MEMGETOOBSEL, &old_oobinfo) != 0) {
-					perror("MEMGETOOBSEL");
-					close(fd);
-					exit(EXIT_FAILURE);
-				}
-				if (ioctl(fd, MEMSETOOBSEL, &none_oobinfo) != 0) {
-					perror("MEMSETOOBSEL");
-					close(fd);
-					exit(EXIT_FAILURE);
-				}
-				oobinfochanged = 1;
-				break;
+				errmsg_die("ioctl MTDFILEMODE is missing");
 			default:
 				perror("MTDFILEMODE");
 				close(fd);
@@ -670,15 +655,6 @@  restoreoob:
 	libmtd_close(mtd_desc);
 	free(filebuf);
 	free(oobbuf);
-
-	if (oobinfochanged == 1) {
-		if (ioctl(fd, MEMSETOOBSEL, &old_oobinfo) != 0) {
-			perror("MEMSETOOBSEL");
-			close(fd);
-			exit(EXIT_FAILURE);
-		}
-	}
-
 	close(fd);
 
 	if (failed