From a66ceba293a4cbbd3877c7d55206753370f95e80 Mon Sep 17 00:00:00 2001
From: Peter Stuge <peter@stuge.se>
Date: Wed, 6 May 2009 13:43:26 +0000
Subject: [PATCH] Cleanup redundant condition and clarify message a little
Corresponding to flashrom svn r466.
Signed-off-by: Peter Stuge <peter@stuge.se>
Acked-by: Peter Stuge <peter@stuge.se>
---
chipset_enable.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/chipset_enable.c b/chipset_enable.c
index c52dd15..8cb30cc 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -675,12 +675,11 @@ static int enable_flash_sb600(struct pci_dev *dev, const char *name)
prot &= 0xfffffffc;
pci_write_byte(dev, reg, prot);
prot = pci_read_long(dev, reg);
- if (prot & 0x3)
- printf("SB600 still %s%sprotected from %u to %u\n",
- (prot & 0x1) ? "write " : "",
- (prot & 0x2) ? "read " : "",
- (prot & 0xfffffc00),
- (prot & 0xfffffc00) + ((prot & 0x3ff) << 8));
+ printf("SB600 %s%sunprotect failed from %u to %u\n",
+ (prot & 0x1) ? "write " : "",
+ (prot & 0x2) ? "read " : "",
+ (prot & 0xfffffc00),
+ (prot & 0xfffffc00) + ((prot & 0x3ff) << 8));
}
/* Read SPI_BaseAddr */
--
GitLab