summaryrefslogtreecommitdiff
path: root/drivers/bcma/scan.c
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-01-16 20:59:39 +0100
committerKalle Valo <kvalo@codeaurora.org>2015-01-23 19:44:58 +0200
commit799038ea9bbbfee240b85bcb17e487d44cdf5009 (patch)
tree8ab5ea60a4afa27cd952aa0afc58e2151f65e6bd /drivers/bcma/scan.c
parent6b47aacaa4491ab04630ab0aec10d10e6ac9e14f (diff)
downloadlinux-sh-799038ea9bbbfee240b85bcb17e487d44cdf5009.tar.gz
bcma: clean bus initialization code
This moves main bus init code to the main.c and renames old function to make its purpose clear. Thanks to this change we'll also be able to separate scanning from registration (and support PCIe Gen 2 devices) in the future. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/bcma/scan.c')
-rw-r--r--drivers/bcma/scan.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 917520776879..5328ee5b4df0 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -435,15 +435,12 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32 __iomem **eromptr,
return 0;
}
-void bcma_init_bus(struct bcma_bus *bus)
+void bcma_detect_chip(struct bcma_bus *bus)
{
s32 tmp;
struct bcma_chipinfo *chipinfo = &(bus->chipinfo);
char chip_id[8];
- INIT_LIST_HEAD(&bus->cores);
- bus->nr_cores = 0;
-
bcma_scan_switch_core(bus, BCMA_ADDR_BASE);
tmp = bcma_scan_read32(bus, 0, BCMA_CC_ID);