diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_main.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c index b199d32c37ea..60a97450a6ed 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c | |||
@@ -2684,14 +2684,10 @@ static int bcm43xx_probe_cores(struct bcm43xx_private *bcm) | |||
2684 | bcm->chip_id, bcm->chip_rev); | 2684 | bcm->chip_id, bcm->chip_rev); |
2685 | dprintk(KERN_INFO PFX "Number of cores: %d\n", core_count); | 2685 | dprintk(KERN_INFO PFX "Number of cores: %d\n", core_count); |
2686 | if (bcm->core_chipcommon.available) { | 2686 | if (bcm->core_chipcommon.available) { |
2687 | dprintk(KERN_INFO PFX "Core 0: ID 0x%x, rev 0x%x, vendor 0x%x, %s\n", | 2687 | dprintk(KERN_INFO PFX "Core 0: ID 0x%x, rev 0x%x, vendor 0x%x\n", |
2688 | core_id, core_rev, core_vendor, | 2688 | core_id, core_rev, core_vendor); |
2689 | bcm43xx_core_enabled(bcm) ? "enabled" : "disabled"); | ||
2690 | } | ||
2691 | |||
2692 | if (bcm->core_chipcommon.available) | ||
2693 | current_core = 1; | 2689 | current_core = 1; |
2694 | else | 2690 | } else |
2695 | current_core = 0; | 2691 | current_core = 0; |
2696 | for ( ; current_core < core_count; current_core++) { | 2692 | for ( ; current_core < core_count; current_core++) { |
2697 | struct bcm43xx_coreinfo *core; | 2693 | struct bcm43xx_coreinfo *core; |
@@ -2709,9 +2705,8 @@ static int bcm43xx_probe_cores(struct bcm43xx_private *bcm) | |||
2709 | core_rev = (sb_id_hi & 0xF); | 2705 | core_rev = (sb_id_hi & 0xF); |
2710 | core_vendor = (sb_id_hi & 0xFFFF0000) >> 16; | 2706 | core_vendor = (sb_id_hi & 0xFFFF0000) >> 16; |
2711 | 2707 | ||
2712 | dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x, %s\n", | 2708 | dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x\n", |
2713 | current_core, core_id, core_rev, core_vendor, | 2709 | current_core, core_id, core_rev, core_vendor); |
2714 | bcm43xx_core_enabled(bcm) ? "enabled" : "disabled" ); | ||
2715 | 2710 | ||
2716 | core = NULL; | 2711 | core = NULL; |
2717 | switch (core_id) { | 2712 | switch (core_id) { |