diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-10-14 02:47:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-10-14 02:47:36 +0000 |
| commit | fd811bf54ced0e0ff4c1c02720a0f116fff21b4d (patch) | |
| tree | 4041f1a7dfc40620ac439b37c4e65abb7dad3b1a /target/linux/generic-2.6/files/drivers/ssb/scan.c | |
| parent | af03fdb6c5d9f94ec372cc9764a17b7d43a8edb0 (diff) | |
| download | mtk-20170518-fd811bf54ced0e0ff4c1c02720a0f116fff21b4d.zip mtk-20170518-fd811bf54ced0e0ff4c1c02720a0f116fff21b4d.tar.gz mtk-20170518-fd811bf54ced0e0ff4c1c02720a0f116fff21b4d.tar.bz2 | |
sync ssb with upstream
SVN-Revision: 9302
Diffstat (limited to 'target/linux/generic-2.6/files/drivers/ssb/scan.c')
| -rw-r--r-- | target/linux/generic-2.6/files/drivers/ssb/scan.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/target/linux/generic-2.6/files/drivers/ssb/scan.c b/target/linux/generic-2.6/files/drivers/ssb/scan.c index b5d909c..96258c6 100644 --- a/target/linux/generic-2.6/files/drivers/ssb/scan.c +++ b/target/linux/generic-2.6/files/drivers/ssb/scan.c @@ -15,19 +15,17 @@ #include <linux/ssb/ssb.h> #include <linux/ssb/ssb_regs.h> #include <linux/pci.h> -#include <asm/io.h> +#include <linux/io.h> -#ifdef CONFIG_SSB_PCMCIAHOST -# include <pcmcia/cs_types.h> -# include <pcmcia/cs.h> -# include <pcmcia/cistpl.h> -# include <pcmcia/ds.h> -#endif +#include <pcmcia/cs_types.h> +#include <pcmcia/cs.h> +#include <pcmcia/cistpl.h> +#include <pcmcia/ds.h> #include "ssb_private.h" -const char * ssb_core_name(u16 coreid) +const char *ssb_core_name(u16 coreid) { switch (coreid) { case SSB_DEV_CHIPCOMMON: @@ -205,7 +203,7 @@ void ssb_iounmap(struct ssb_bus *bus) #ifdef CONFIG_SSB_PCIHOST pci_iounmap(bus->host_pci, bus->mmio); #else - assert(0); /* Can't reach this code. */ + SSB_BUG_ON(1); /* Can't reach this code. */ #endif break; } @@ -213,8 +211,8 @@ void ssb_iounmap(struct ssb_bus *bus) bus->mapped_device = NULL; } -static void __iomem * ssb_ioremap(struct ssb_bus *bus, - unsigned long baseaddr) +static void __iomem *ssb_ioremap(struct ssb_bus *bus, + unsigned long baseaddr) { void __iomem *mmio = NULL; @@ -229,7 +227,7 @@ static void __iomem * ssb_ioremap(struct ssb_bus *bus, #ifdef CONFIG_SSB_PCIHOST mmio = pci_iomap(bus->host_pci, 0, ~0UL); #else - assert(0); /* Can't reach this code. */ + SSB_BUG_ON(1); /* Can't reach this code. */ #endif break; } |