From 5917f700b4d1f23817836cf6f18ed29a4781cb62 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Fri, 25 Mar 2011 11:25:58 +0100
Subject: [PATCH] --- yaml --- r: 248976 b: refs/heads/master c:
 c6042b3043f4ee1776c10572f517b25ed4f8188f h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/staging/brcm80211/util/bcmsrom.c | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index e7ffedb2ee38..a58e4026f856 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0686acf730344e0e9442649952e34fe4e1d6ccb0
+refs/heads/master: c6042b3043f4ee1776c10572f517b25ed4f8188f
diff --git a/trunk/drivers/staging/brcm80211/util/bcmsrom.c b/trunk/drivers/staging/brcm80211/util/bcmsrom.c
index eca35b94e96c..5c4acece3d79 100644
--- a/trunk/drivers/staging/brcm80211/util/bcmsrom.c
+++ b/trunk/drivers/staging/brcm80211/util/bcmsrom.c
@@ -44,8 +44,6 @@
 
 #include <linux/if_ether.h>
 
-#define	BS_ERROR(args)
-
 #define SROM_OFFSET(sih) ((sih->ccrev > 31) ? \
 	(((sih->cccaps & CC_CAP_SROM) == 0) ? NULL : \
 	 ((u8 *)curmap + PCI_16KB0_CCREGS_OFFSET + CC_SROM_OTP)) : \
@@ -64,8 +62,6 @@ typedef struct varbuf {
 extern char *_vars;
 extern uint _varsz;
 
-#define SROM_CIS_SINGLE	1
-
 static int initvars_srom_si(si_t *sih, void *curmap, char **vars, uint *count);
 static void _initvars_srom_pci(u8 sromrev, u16 *srom, uint off, varbuf_t *b);
 static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count);
@@ -1424,7 +1420,6 @@ srom_cc_cmd(si_t *sih, void *ccregs, u32 cmd,
 	}
 
 	if (!wait_cnt) {
-		BS_ERROR(("%s: Command 0x%x timed out\n", __func__, cmd));
 		return 0xffff;
 	}
 	if (cmd == SRC_OP_READ)
@@ -1490,8 +1485,6 @@ sprom_read_pci(si_t *sih, u16 *sprom, uint wordoff,
 			 * is blank, regardless of the rest of the content, so declare
 			 * it bad.
 			 */
-			BS_ERROR(("%s: buf[0] = 0x%x, returning bad-crc\n",
-				  __func__, buf[0]));
 			return 1;
 		}
 
@@ -1500,7 +1493,6 @@ sprom_read_pci(si_t *sih, u16 *sprom, uint wordoff,
 		if (hndcrc8((u8 *) buf, nwords * 2, CRC8_INIT_VALUE) !=
 		    CRC8_GOOD_VALUE) {
 			/* DBG only pci always read srom4 first, then srom8/9 */
-			/* BS_ERROR(("%s: bad crc\n", __func__)); */
 			err = 1;
 		}
 		/* now correct the endianness of the byte array */
@@ -1535,8 +1527,6 @@ static int otp_read_pci(si_t *sih, u16 *buf, uint bufsz)
 		 * is blank, regardless of the rest of the content, so declare
 		 * it bad.
 		 */
-		BS_ERROR(("%s: buf[0] = 0x%x, returning bad-crc\n", __func__,
-			  buf[0]));
 		return 1;
 	}
 
@@ -1544,7 +1534,6 @@ static int otp_read_pci(si_t *sih, u16 *buf, uint bufsz)
 	htol16_buf(buf, bufsz);
 	if (hndcrc8((u8 *) buf, SROM4_WORDS * 2, CRC8_INIT_VALUE) !=
 	    CRC8_GOOD_VALUE) {
-		BS_ERROR(("%s: bad crc\n", __func__));
 		err = 1;
 	}
 	/* now correct the endianness of the byte array */
@@ -1884,10 +1873,6 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count)
 			    sprom_read_pci(sih, sromwindow, 0, srom,
 					   SROM4_WORDS, true);
 			sromrev = srom[SROM4_CRCREV] & 0xff;
-			if (err)
-				BS_ERROR(("%s: srom %d, bad crc\n", __func__,
-					  sromrev));
-
 		} else if (err == 0) {
 			/* srom is good and is rev < 4 */
 			/* top word of sprom contains version and crc8 */
@@ -1921,7 +1906,6 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count)
 		u32 val;
 		val = 0;
 
-		BS_ERROR(("Neither SPROM nor OTP has valid image\n"));
 		value = si_getdevpathvar(sih, "sromrev");
 		if (value) {
 			sromrev = (u8) simple_strtoul(value, NULL, 0);
@@ -1929,8 +1913,6 @@ static int initvars_srom_pci(si_t *sih, void *curmap, char **vars, uint *count)
 			goto varscont;
 		}
 
-		BS_ERROR(("%s, SROM CRC Error\n", __func__));
-
 		value = si_getnvramflvar(sih, "sromrev");
 		if (value) {
 			err = 0;