summaryrefslogtreecommitdiffstats
path: root/drivers/ssb/pci.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2007-11-09 16:54:45 -0600
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:04:40 -0800
commitac82fab44f6b981e3f6b53784e2f23838f4908e1 (patch)
treebc1f0ccb118aff495ee2b9448e8fd51b92958298 /drivers/ssb/pci.c
parent3957ccb56e17ca839265ccb292c4c6850dcf5d32 (diff)
downloadlinux-stable-ac82fab44f6b981e3f6b53784e2f23838f4908e1.tar.gz
linux-stable-ac82fab44f6b981e3f6b53784e2f23838f4908e1.tar.bz2
linux-stable-ac82fab44f6b981e3f6b53784e2f23838f4908e1.zip
ssb: Add new SPROM structure while keeping the old
The SPROM's for various devices utilizing the Sonics Silicon Backplane come with various revisions. The Revision 2 SPROM inherited the data layout of 1, and Revision 3 inherited the layout of 2. The first instance of Revision 4 has now been found in a BCM4328 wireless LAN card. This device does not inherit any layout from previous versions. Although it was possible to create a data structure that kept all the old layouts, we decided to start fresh, keep only those SPROM variables that are used by the drivers that utilize ssb, and to do the conversion in such a manner that neither compilation or execution will be affected if a bisection lands in the middle of these changes, while keeping the patches as small as possible. In this patch, the sprom structures are changed while maintaining the old ones. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb/pci.c')
-rw-r--r--drivers/ssb/pci.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 0ab095c6581a..7226a716acdf 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -423,8 +423,6 @@ static int sprom_extract(struct ssb_bus *bus,
memset(out, 0, sizeof(*out));
SPEX(revision, SSB_SPROM_REVISION, SSB_SPROM_REVISION_REV, 0);
- SPEX(crc, SSB_SPROM_REVISION, SSB_SPROM_REVISION_CRC,
- SSB_SPROM_REVISION_CRC_SHIFT);
if ((bus->chip_id & 0xFF00) == 0x4400) {
/* Workaround: The BCM44XX chip has a stupid revision