include: convert various register fcns to macros to avoid include chaining

[pandora-kernel.git] / include / linux / bcma / bcma.h

diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 8c96654..4d4b59d 100644 (file)
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -6,6 +6,7 @@
 
 #include <linux/bcma/bcma_driver_chipcommon.h>
 #include <linux/bcma/bcma_driver_pci.h>
+#include <linux/bcma/bcma_driver_mips.h>
 #include <linux/ssb/ssb.h> /* SPROM sharing */
 
 #include "bcma_regs.h"
@@ -14,9 +15,9 @@ struct bcma_device;
 struct bcma_bus;
 
 enum bcma_hosttype {
-       BCMA_HOSTTYPE_NONE,
        BCMA_HOSTTYPE_PCI,
        BCMA_HOSTTYPE_SDIO,
+       BCMA_HOSTTYPE_SOC,
 };
 
 struct bcma_chipinfo {
@@ -130,6 +131,7 @@ struct bcma_device {
 
        struct device dev;
        struct device *dma_dev;
+
        unsigned int irq;
        bool dev_registered;
 
@@ -138,6 +140,9 @@ struct bcma_device {
        u32 addr;
        u32 wrap;
 
+       void __iomem *io_addr;
+       void __iomem *io_wrap;
+
        void *drvdata;
        struct list_head list;
 };
@@ -165,10 +170,9 @@ struct bcma_driver {
 };
 extern
 int __bcma_driver_register(struct bcma_driver *drv, struct module *owner);
-static inline int bcma_driver_register(struct bcma_driver *drv)
-{
-       return __bcma_driver_register(drv, THIS_MODULE);
-}
+#define bcma_driver_register(drv) \
+       __bcma_driver_register(drv, THIS_MODULE)
+
 extern void bcma_driver_unregister(struct bcma_driver *drv);
 
 struct bcma_bus {
@@ -190,9 +194,11 @@ struct bcma_bus {
        struct bcma_device *mapped_core;
        struct list_head cores;
        u8 nr_cores;
+       u8 init_done:1;
 
        struct bcma_drv_cc drv_cc;
        struct bcma_drv_pci drv_pci;
+       struct bcma_drv_mips drv_mips;
 
        /* We decided to share SPROM struct with SSB as long as we do not need
         * any hacks for BCMA. This simplifies drivers code. */