| To: | ralf@linux-mips.org, linux-wireless@vger.kernel.org, zajec5@gmail.com, linux-mips@linux-mips.org |
|---|---|
| Subject: | [PATCH 02/11] bcma: move initializing of struct bcma_bus to own function. |
| From: | Hauke Mehrtens <hauke@hauke-m.de> |
| Date: | Sat, 9 Jul 2011 13:05:54 +0200 |
| Cc: | mb@bu3sch.de, george@znau.edu.ua, arend@broadcom.com, b43-dev@lists.infradead.org, bernhardloos@googlemail.com, arnd@arndb.de, julian.calaby@gmail.com, sshtylyov@mvista.com, Hauke Mehrtens <hauke@hauke-m.de> |
| In-reply-to: | <1310209563-6405-1-git-send-email-hauke@hauke-m.de> |
| References: | <1310209563-6405-1-git-send-email-hauke@hauke-m.de> |
| Sender: | linux-mips-bounce@linux-mips.org |
This makes it possible to use this code in some other method.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
drivers/bcma/scan.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 4012d8d..7970553 100644
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -312,15 +312,10 @@ static int bcma_get_next_core(struct bcma_bus *bus, u32
__iomem **eromptr,
return 0;
}
-int bcma_bus_scan(struct bcma_bus *bus)
+static void bcma_init_bus(struct bcma_bus *bus)
{
- u32 erombase;
- u32 __iomem *eromptr, *eromend;
-
s32 tmp;
- int err;
-
INIT_LIST_HEAD(&bus->cores);
bus->nr_cores = 0;
@@ -330,6 +325,16 @@ int bcma_bus_scan(struct bcma_bus *bus)
bus->chipinfo.id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
bus->chipinfo.rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
bus->chipinfo.pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
+}
+
+int bcma_bus_scan(struct bcma_bus *bus)
+{
+ u32 erombase;
+ u32 __iomem *eromptr, *eromend;
+
+ int err;
+
+ bcma_init_bus(bus);
erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
eromptr = bus->mmio;
--
1.7.4.1
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH 00/11] bcma: add support for embedded devices like bcm4716, Hauke Mehrtens |
|---|---|
| Next by Date: | [PATCH 03/11] bcma: add functions to scan cores needed on SoCs, Hauke Mehrtens |
| Previous by Thread: | [PATCH 01/11] bcma: move parsing of EEPROM into own function., Hauke Mehrtens |
| Next by Thread: | [PATCH 03/11] bcma: add functions to scan cores needed on SoCs, Hauke Mehrtens |
| Indexes: | [Date] [Thread] [Top] [All Lists] |