1 files changed, 24 insertions, 28 deletions

diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index 6e88d2b603b..f52966305e0 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -573,37 +573,34 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
         ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
         memset(out->et0mac, 0xFF, 6);           /* preset et0 and et1 mac */
         memset(out->et1mac, 0xFF, 6);
+
         if ((bus->chip_id & 0xFF00) == 0x4400) {
                 /* Workaround: The BCM44XX chip has a stupid revision
                  * number stored in the SPROM.
                  * Always extract r1. */
                 out->revision = 1;
+                ssb_dprintk(KERN_DEBUG PFX "SPROM treated as revision %d\n", out->revision);
+        }
+
+        switch (out->revision) {
+        case 1:
+        case 2:
+        case 3:
                 sprom_extract_r123(out, in);
-        } else if (bus->chip_id == 0x4321) {
-                /* the BCM4328 has a chipid == 0x4321 and a rev 4 SPROM */
-                out->revision = 4;
+                break;
+        case 4:
+        case 5:
                 sprom_extract_r45(out, in);
-        } else {
-                switch (out->revision) {
-                case 1:
-                case 2:
-                case 3:
-                        sprom_extract_r123(out, in);
-                        break;
-                case 4:
-                case 5:
-                        sprom_extract_r45(out, in);
-                        break;
-                case 8:
-                        sprom_extract_r8(out, in);
-                        break;
-                default:
-                        ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
-                                   "  revision %d detected. Will extract"
-                                   " v1\n", out->revision);
-                        out->revision = 1;
-                        sprom_extract_r123(out, in);
-                }
+                break;
+        case 8:
+                sprom_extract_r8(out, in);
+                break;
+        default:
+                ssb_printk(KERN_WARNING PFX "Unsupported SPROM"
+                           "  revision %d detected. Will extract"
+                           " v1\n", out->revision);
+                out->revision = 1;
+                sprom_extract_r123(out, in);
         }
 
         if (out->boardflags_lo == 0xFFFF)
@@ -618,7 +615,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
                              struct ssb_sprom *sprom)
 {
         const struct ssb_sprom *fallback;
-        int err = -ENOMEM;
+        int err;
         u16 *buf;
 
         if (!ssb_is_sprom_available(bus)) {
@@ -645,7 +642,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
 
         buf = kcalloc(SSB_SPROMSIZE_WORDS_R123, sizeof(u16), GFP_KERNEL);
         if (!buf)
-                goto out;
+                return -ENOMEM;
         bus->sprom_size = SSB_SPROMSIZE_WORDS_R123;
         sprom_do_read(bus, buf);
         err = sprom_check_crc(buf, bus->sprom_size);
@@ -655,7 +652,7 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
                 buf = kcalloc(SSB_SPROMSIZE_WORDS_R4, sizeof(u16),
                               GFP_KERNEL);
                 if (!buf)
-                        goto out;
+                        return -ENOMEM;
                 bus->sprom_size = SSB_SPROMSIZE_WORDS_R4;
                 sprom_do_read(bus, buf);
                 err = sprom_check_crc(buf, bus->sprom_size);
@@ -677,7 +674,6 @@ static int ssb_pci_sprom_get(struct ssb_bus *bus,
 
 out_free:
         kfree(buf);
-out:
         return err;
 }