Skip to content

L
linux-davinci-2.6.23
Commit 50da7f60 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files
Options

[MTD] cfi_cmdset_0001: Fix compiler warnings 

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 51502287
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
drivers/mtd/chips/cfi_cmdset_0001.c
View file @ 50da7f60
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* *
* (C) 2000 Red Hat. GPL'd * (C) 2000 Red Hat. GPL'd
* *
* $Id: cfi_cmdset_0001.c,v 1.170 2005/03/16 22:41:05 nico Exp $ * $Id: cfi_cmdset_0001.c,v 1.171 2005/03/19 22:39:49 gleixner Exp $
* *
* *
* 10/10/2000 Nicolas Pitre <nico@cam.org> * 10/10/2000 Nicolas Pitre <nico@cam.org>
...@@ -1707,24 +1707,24 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip, ...@@ -1707,24 +1707,24 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
chipstatus = MERGESTATUS(status); chipstatus = MERGESTATUS(status);
if ((chipstatus & 0x30) == 0x30) { if ((chipstatus & 0x30) == 0x30) {
printk(KERN_NOTICE "Chip reports improper command sequence: status 0x%x\n", chipstatus); printk(KERN_NOTICE "Chip reports improper command sequence: status 0x%lx\n", chipstatus);
ret = -EIO; ret = -EIO;
} else if (chipstatus & 0x02) { } else if (chipstatus & 0x02) {
/* Protection bit set */ /* Protection bit set */
ret = -EROFS; ret = -EROFS;
} else if (chipstatus & 0x8) { } else if (chipstatus & 0x8) {
/* Voltage */ /* Voltage */
printk(KERN_WARNING "Chip reports voltage low on erase: status 0x%x\n", chipstatus); printk(KERN_WARNING "Chip reports voltage low on erase: status 0x%lx\n", chipstatus);
ret = -EIO; ret = -EIO;
} else if (chipstatus & 0x20) { } else if (chipstatus & 0x20) {
if (retries--) { if (retries--) {
printk(KERN_DEBUG "Chip erase failed at 0x%08lx: status 0x%x. Retrying...\n", adr, chipstatus); printk(KERN_DEBUG "Chip erase failed at 0x%08lx: status 0x%lx. Retrying...\n", adr, chipstatus);
timeo = jiffies + HZ; timeo = jiffies + HZ;
put_chip(map, chip, adr); put_chip(map, chip, adr);
spin_unlock(chip->mutex); spin_unlock(chip->mutex);
goto retry; goto retry;
} }
printk(KERN_DEBUG "Chip erase failed at 0x%08lx: status 0x%x\n", adr, chipstatus); printk(KERN_DEBUG "Chip erase failed at 0x%08lx: status 0x%lx\n", adr, chipstatus);
ret = -EIO; ret = -EIO;
} }
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment