brcm80211: fmac: introduce common bus interface struct brcmf_bus

struct brcmf_bus will contain function porinter, bus specific
private structure pointer and interface context of generic layer
and bus layer. It will be the only shared structure between generic
and bus layer. This patch is part of fullmac bus interface
refactoring.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 6c85d668c9d7caf74848193a94501ab3c6a99bd3..74933dccf69ee2d3eaa664008fec581f0efa5b33 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -40,7 +40,8 @@
 
 static void brcmf_sdioh_irqhandler(struct sdio_func *func)
 {
-       struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);
+       struct brcmf_bus *bus_if = dev_get_drvdata(&func->card->dev);
+       struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
 
        brcmf_dbg(TRACE, "***IRQHandler\n");
 

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 7a2325b2a564502a29b541476d5a89f25ab2c141..77f84f8a0081e79288f8c525be5a55541ebbe8be 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -461,6 +461,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
 {
        int ret = 0;
        struct brcmf_sdio_dev *sdiodev;
+       struct brcmf_bus *bus_if;
        brcmf_dbg(TRACE, "Enter\n");
        brcmf_dbg(TRACE, "func->class=%x\n", func->class);
        brcmf_dbg(TRACE, "sdio_vendor: 0x%04x\n", func->vendor);
@@ -472,12 +473,18 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
                        brcmf_dbg(ERROR, "card private drvdata occupied\n");
                        return -ENXIO;
                }
+               bus_if = kzalloc(sizeof(struct brcmf_bus), GFP_KERNEL);
+               if (!bus_if)
+                       return -ENOMEM;
                sdiodev = kzalloc(sizeof(struct brcmf_sdio_dev), GFP_KERNEL);
                if (!sdiodev)
                        return -ENOMEM;
+               sdiodev->dev = &func->card->dev;
                sdiodev->func[0] = func->card->sdio_func[0];
                sdiodev->func[1] = func;
-               dev_set_drvdata(&func->card->dev, sdiodev);
+               bus_if->bus_priv = sdiodev;
+               bus_if->type = SDIO_BUS;
+               dev_set_drvdata(&func->card->dev, bus_if);
 
                atomic_set(&sdiodev->suspend, false);
                init_waitqueue_head(&sdiodev->request_byte_wait);
@@ -487,7 +494,8 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
        }
 
        if (func->num == 2) {
-               sdiodev = dev_get_drvdata(&func->card->dev);
+               bus_if = dev_get_drvdata(&func->card->dev);
+               sdiodev = bus_if->bus_priv;
                if ((!sdiodev) || (sdiodev->func[1]->card != func->card))
                        return -ENODEV;
                sdiodev->func[2] = func;
@@ -501,6 +509,7 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
 
 static void brcmf_ops_sdio_remove(struct sdio_func *func)
 {
+       struct brcmf_bus *bus_if;
        struct brcmf_sdio_dev *sdiodev;
        brcmf_dbg(TRACE, "Enter\n");
        brcmf_dbg(INFO, "func->class=%x\n", func->class);
@@ -509,10 +518,12 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)
        brcmf_dbg(INFO, "Function#: 0x%04x\n", func->num);
 
        if (func->num == 2) {
-               sdiodev = dev_get_drvdata(&func->card->dev);
+               bus_if = dev_get_drvdata(&func->card->dev);
+               sdiodev = bus_if->bus_priv;
                brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_remove...\n");
                brcmf_sdio_remove(sdiodev);
                dev_set_drvdata(&func->card->dev, NULL);
+               kfree(bus_if);
                kfree(sdiodev);
        }
 }
@@ -523,11 +534,12 @@ static int brcmf_sdio_suspend(struct device *dev)
        mmc_pm_flag_t sdio_flags;
        struct brcmf_sdio_dev *sdiodev;
        struct sdio_func *func = dev_to_sdio_func(dev);
+       struct brcmf_bus *bus_if = dev_get_drvdata(&func->card->dev);
        int ret = 0;
 
        brcmf_dbg(TRACE, "\n");
 
-       sdiodev = dev_get_drvdata(&func->card->dev);
+       sdiodev = bus_if->bus_priv;
 
        atomic_set(&sdiodev->suspend, true);
 
@@ -552,8 +564,9 @@ static int brcmf_sdio_resume(struct device *dev)
 {
        struct brcmf_sdio_dev *sdiodev;
        struct sdio_func *func = dev_to_sdio_func(dev);
+       struct brcmf_bus *bus_if = dev_get_drvdata(&func->card->dev);
 
-       sdiodev = dev_get_drvdata(&func->card->dev);
+       sdiodev = bus_if->bus_priv;
        brcmf_sdio_wdtmr_enable(sdiodev, true);
        atomic_set(&sdiodev->suspend, false);
        return 0;

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 451b34ba39842588891850485f77ac238c6deaf9..a557971044bc2ee6a57c48fa74013b5850dd4913 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -571,6 +571,11 @@ struct brcmf_dcmd {
        uint needed;            /* bytes needed (optional) */
 };
 
+struct brcmf_bus {
+       u8 type;                /* bus type */
+       void *bus_priv;         /* pointer to bus private structure */
+};
+
 /* Forward decls for struct brcmf_pub (see below) */
 struct brcmf_sdio;             /* device bus info */
 struct brcmf_proto;    /* device communication protocol info */

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index 0618f5ed1acbdd9181ba80aaaa7f79f15d3d2385..c4c2543438ec6e6a73faa930987e2176b966dc08 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@ -134,7 +134,7 @@ struct brcmf_sdio_dev {
        wait_queue_head_t request_word_wait;
        wait_queue_head_t request_chain_wait;
        wait_queue_head_t request_buffer_wait;
-
+       struct device *dev;
 };
 
 /* Register/deregister device interrupt handler. */