Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 22:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

mtd: mtdoops: do not use mtd->panic_write directly

Browse Source 
Instead of checking if 'mtd->panic_write' is defined, call 'mtd_panic_write()'
and check the error code - '-EOPNOTSUPP' will be returned if the function is
not defined.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Artem Bityutskiy 2011-12-28 17:27:18 +02:00 committed by David Woodhouse
parent 4991e7251e
commit 016c1291ce
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/mtd/mtdoops.c
View File

@ -221,10 +221,14 @@ static void mtdoops_write(struct mtdoops_context *cxt, int panic)
hdr[0] = cxt->nextcount; hdr[0] = cxt->nextcount;
hdr[1] = MTDOOPS_KERNMSG_MAGIC; hdr[1] = MTDOOPS_KERNMSG_MAGIC;
if (panic) if (panic) {
ret = mtd_panic_write(mtd, cxt->nextpage * record_size, ret = mtd_panic_write(mtd, cxt->nextpage * record_size,
record_size, &retlen, cxt->oops_buf); record_size, &retlen, cxt->oops_buf);
else if (ret == -EOPNOTSUPP) {
printk(KERN_ERR "mtdoops: Cannot write from panic without panic_write\n");
return;
}
} else
ret = mtd_write(mtd, cxt->nextpage * record_size, ret = mtd_write(mtd, cxt->nextpage * record_size,
record_size, &retlen, cxt->oops_buf); record_size, &retlen, cxt->oops_buf);
@ -330,13 +334,8 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper,
memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy); memcpy(dst + l1_cpy, s2 + s2_start, l2_cpy);
/* Panics must be written immediately */ /* Panics must be written immediately */
if (reason != KMSG_DUMP_OOPS) { if (reason != KMSG_DUMP_OOPS)
if (!cxt->mtd->panic_write) mtdoops_write(cxt, 1);
printk(KERN_ERR "mtdoops: Cannot write from panic without panic_write\n");
else
mtdoops_write(cxt, 1);
return;
}
/* For other cases, schedule work to write it "nicely" */ /* For other cases, schedule work to write it "nicely" */
schedule_work(&cxt->work_write); schedule_work(&cxt->work_write);

2
include/linux/mtd/mtd.h
View File

@ -311,6 +311,8 @@ static inline int mtd_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf) size_t *retlen, const u_char *buf)
{ {
*retlen = 0; *retlen = 0;
if (!mtd->panic_write)
return -EOPNOTSUPP;
return mtd->panic_write(mtd, to, len, retlen, buf); return mtd->panic_write(mtd, to, len, retlen, buf);
} }