--- drivers/ssb/pci.c

+++ drivers/ssb/pci.c

@@ -22,7 +22,6 @@

#include "ssb_private.h"

-bool ssb_is_sprom_available(struct ssb_bus *bus);

/* Define the following to 1 to enable a printk on each coreswitch. */

#define SSB_VERBOSE_PCICORESWITCH_DEBUG 0

@@ -168,7 +167,7 @@ err_pci:

}

/* Get the word-offset for a SSB_SPROM_XXX define. */

-#define SPOFF(offset) ((offset) / sizeof(u16))

+#define SPOFF(offset) (((offset) - SSB_SPROM_BASE1) / sizeof(u16))

/* Helper to extract some _offset, which is one of the SSB_SPROM_XXX defines. */

#define SPEX16(_outvar, _offset, _mask, _shift) \

out->_outvar = ((in[SPOFF(_offset)] & (_mask)) >> (_shift))

@@ -253,11 +252,6 @@ static int sprom_do_read(struct ssb_bus

{

int i;

- /* Check if SPROM can be read */

- if (ioread16(bus->mmio + bus->sprom_offset) == 0xFFFF) {

- ssb_printk(KERN_ERR PFX "Unable to read SPROM\n");

- return -ENODEV;

- }

for (i = 0; i < bus->sprom_size; i++)

sprom[i] = ioread16(bus->mmio + bus->sprom_offset + (i * 2));

@@ -652,23 +646,17 @@ static int ssb_pci_sprom_get(struct ssb_

if (!buf)

goto out;

bus->sprom_size = SSB_SPROMSIZE_WORDS_R123;

- err = sprom_do_read(bus, buf);

- if (err)

- goto out_free;

+ sprom_do_read(bus, buf);

err = sprom_check_crc(buf, bus->sprom_size);

if (err) {

/* try for a 440 byte SPROM - revision 4 and higher */

kfree(buf);

buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),

GFP_KERNEL);

- if (!buf) {

- err = -ENOMEM;

+ if (!buf)

goto out;

- }

bus->sprom_size = SSB_SPROMSIZE_WORDS_R4;

- err = sprom_do_read(bus, buf);

- if (err)

- goto out_free;

+ sprom_do_read(bus, buf);

err = sprom_check_crc(buf, bus->sprom_size);

if (err) {

/* All CRC attempts failed.