summaryrefslogtreecommitdiff
path: root/nanddump.c
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2011-08-19 10:07:56 -0700
committerArtem Bityutskiy <artem.bityutskiy@intel.com>2011-08-23 09:27:51 +0300
commitd2c8ef937d0ae04ee7c81a7243e265f606ef9ce8 (patch)
tree31f1a05941c13a6212e3c344b8ce733ffe785006 /nanddump.c
parent6e894b9fd9544c109817bd88811d83cd93970e31 (diff)
nanddump: kill usages of MEMSETOOBSEL ioctl
The ioctl MEMSETOOBSEL hasn't existed for a long time. Using it as a backup to MTDFILEMODE is pointless, so just remove every time it is used. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
Diffstat (limited to 'nanddump.c')
-rw-r--r--nanddump.c43
1 files changed, 3 insertions, 40 deletions
diff --git a/nanddump.c b/nanddump.c
index 0b931db..7a24c0d 100644
--- a/nanddump.c
+++ b/nanddump.c
@@ -34,10 +34,6 @@
#include "common.h"
#include <libmtd.h>
-static struct nand_oobinfo none_oobinfo = {
- .useecc = MTD_NANDECC_OFF,
-};
-
static void display_help(void)
{
printf(
@@ -309,11 +305,10 @@ int main(int argc, char * const argv[])
{
long long ofs, end_addr = 0;
long long blockstart = 1;
- int ret, i, fd, ofd = 0, bs, badblock = 0;
+ int i, fd, ofd = 0, bs, badblock = 0;
struct mtd_dev_info mtd;
char pretty_buf[PRETTY_BUF_LEN];
- int oobinfochanged = 0, firstblock = 1;
- struct nand_oobinfo old_oobinfo;
+ int firstblock = 1;
struct mtd_ecc_stats stat1, stat2;
bool eccstats = false;
unsigned char *readbuf = NULL, *oobbuf = NULL;
@@ -341,26 +336,9 @@ int main(int argc, char * const argv[])
readbuf = xmalloc(sizeof(readbuf) * mtd.min_io_size);
if (noecc) {
- ret = ioctl(fd, MTDFILEMODE, MTD_MODE_RAW);
- if (ret == 0) {
- oobinfochanged = 2;
- } else {
- switch (errno) {
- case ENOTTY:
- if (ioctl(fd, MEMGETOOBSEL, &old_oobinfo) != 0) {
- perror("MEMGETOOBSEL");
- goto closeall;
- }
- if (ioctl(fd, MEMSETOOBSEL, &none_oobinfo) != 0) {
- perror("MEMSETOOBSEL");
- goto closeall;
- }
- oobinfochanged = 1;
- break;
- default:
+ if (ioctl(fd, MTDFILEMODE, MTD_MODE_RAW) != 0) {
perror("MTDFILEMODE");
goto closeall;
- }
}
} else {
/* check if we can read ecc stats */
@@ -498,15 +476,6 @@ int main(int argc, char * const argv[])
write(ofd, oobbuf, mtd.oob_size);
}
- /* reset oobinfo */
- if (oobinfochanged == 1) {
- if (ioctl(fd, MEMSETOOBSEL, &old_oobinfo) != 0) {
- perror("MEMSETOOBSEL");
- close(fd);
- close(ofd);
- return EXIT_FAILURE;
- }
- }
/* Close the output file and MTD device, free memory */
close(fd);
close(ofd);
@@ -517,12 +486,6 @@ int main(int argc, char * const argv[])
return EXIT_SUCCESS;
closeall:
- /* The new mode change is per file descriptor ! */
- if (oobinfochanged == 1) {
- if (ioctl(fd, MEMSETOOBSEL, &old_oobinfo) != 0) {
- perror("MEMSETOOBSEL");
- }
- }
close(fd);
close(ofd);
free(oobbuf);