diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2005-03-19 17:39:52 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-23 06:59:55 -0400 |
commit | 50da7f60960a2e39aa8784983c580a3ddfd9bd8d (patch) | |
tree | 27e3cabed82de859670247def46e4b080eb65924 /drivers | |
parent | 515022870f0f648b9c506a285b1c7e92901dd37f (diff) |
[MTD] cfi_cmdset_0001: Fix compiler warnings
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0001.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index 87554aae01e4..100a00063f87 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * (C) 2000 Red Hat. GPL'd | 5 | * (C) 2000 Red Hat. GPL'd |
6 | * | 6 | * |
7 | * $Id: cfi_cmdset_0001.c,v 1.170 2005/03/16 22:41:05 nico Exp $ | 7 | * $Id: cfi_cmdset_0001.c,v 1.171 2005/03/19 22:39:49 gleixner Exp $ |
8 | * | 8 | * |
9 | * | 9 | * |
10 | * 10/10/2000 Nicolas Pitre <nico@cam.org> | 10 | * 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 | chipstatus = MERGESTATUS(status); | 1707 | chipstatus = MERGESTATUS(status); |
1708 | 1708 | ||
1709 | if ((chipstatus & 0x30) == 0x30) { | 1709 | if ((chipstatus & 0x30) == 0x30) { |
1710 | printk(KERN_NOTICE "Chip reports improper command sequence: status 0x%x\n", chipstatus); | 1710 | printk(KERN_NOTICE "Chip reports improper command sequence: status 0x%lx\n", chipstatus); |
1711 | ret = -EIO; | 1711 | ret = -EIO; |
1712 | } else if (chipstatus & 0x02) { | 1712 | } else if (chipstatus & 0x02) { |
1713 | /* Protection bit set */ | 1713 | /* Protection bit set */ |
1714 | ret = -EROFS; | 1714 | ret = -EROFS; |
1715 | } else if (chipstatus & 0x8) { | 1715 | } else if (chipstatus & 0x8) { |
1716 | /* Voltage */ | 1716 | /* Voltage */ |
1717 | printk(KERN_WARNING "Chip reports voltage low on erase: status 0x%x\n", chipstatus); | 1717 | printk(KERN_WARNING "Chip reports voltage low on erase: status 0x%lx\n", chipstatus); |
1718 | ret = -EIO; | 1718 | ret = -EIO; |
1719 | } else if (chipstatus & 0x20) { | 1719 | } else if (chipstatus & 0x20) { |
1720 | if (retries--) { | 1720 | if (retries--) { |
1721 | printk(KERN_DEBUG "Chip erase failed at 0x%08lx: status 0x%x. Retrying...\n", adr, chipstatus); | 1721 | printk(KERN_DEBUG "Chip erase failed at 0x%08lx: status 0x%lx. Retrying...\n", adr, chipstatus); |
1722 | timeo = jiffies + HZ; | 1722 | timeo = jiffies + HZ; |
1723 | put_chip(map, chip, adr); | 1723 | put_chip(map, chip, adr); |
1724 | spin_unlock(chip->mutex); | 1724 | spin_unlock(chip->mutex); |
1725 | goto retry; | 1725 | goto retry; |
1726 | } | 1726 | } |
1727 | printk(KERN_DEBUG "Chip erase failed at 0x%08lx: status 0x%x\n", adr, chipstatus); | 1727 | printk(KERN_DEBUG "Chip erase failed at 0x%08lx: status 0x%lx\n", adr, chipstatus); |
1728 | ret = -EIO; | 1728 | ret = -EIO; |
1729 | } | 1729 | } |
1730 | } else { | 1730 | } else { |