brcm80211: fmac: save bus interface structure in function 2 device

bus interface was stored in sdio card device. The device pointer
is used as parameter of interface functions between common layer
and bus layer to make the function declaration generic for different
bus type. But the card device is a parent device layer for SDIO
function devices. It doesn't contain all contexts needed by udev.
This patch moves the shared structure to private driver data pointer
of SDIO function 2 device which is more appopriate for net device
and cfg80211 registration.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@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 74933dccf69ee2d3eaa664008fec581f0efa5b33..6c85d668c9d7caf74848193a94501ab3c6a99bd3 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -40,8 +40,7 @@
 
 static void brcmf_sdioh_irqhandler(struct sdio_func *func)
 {
-       struct brcmf_bus *bus_if = dev_get_drvdata(&func->card->dev);
-       struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv;
+       struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);
 
        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 b416e274c677981a314c43043a928d824f9b8865..bc992675eb989dcad1aa1cbbaabf74eae1a614a2 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -481,12 +481,12 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
                        kfree(bus_if);
                        return -ENOMEM;
                }
-               sdiodev->dev = &func->card->dev;
                sdiodev->func[0] = func->card->sdio_func[0];
                sdiodev->func[1] = func;
+               sdiodev->bus_if = bus_if;
                bus_if->bus_priv = sdiodev;
                bus_if->type = SDIO_BUS;
-               dev_set_drvdata(&func->card->dev, bus_if);
+               dev_set_drvdata(&func->card->dev, sdiodev);
 
                atomic_set(&sdiodev->suspend, false);
                init_waitqueue_head(&sdiodev->request_byte_wait);
@@ -496,12 +496,15 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
        }
 
        if (func->num == 2) {
-               bus_if = dev_get_drvdata(&func->card->dev);
-               sdiodev = bus_if->bus_priv;
+               sdiodev = dev_get_drvdata(&func->card->dev);
                if ((!sdiodev) || (sdiodev->func[1]->card != func->card))
                        return -ENODEV;
                sdiodev->func[2] = func;
 
+               bus_if = sdiodev->bus_if;
+               sdiodev->dev = &func->dev;
+               dev_set_drvdata(&func->dev, bus_if);
+
                brcmf_dbg(TRACE, "F2 found, calling brcmf_sdio_probe...\n");
                ret = brcmf_sdio_probe(sdiodev);
        }
@@ -520,11 +523,12 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)
        brcmf_dbg(INFO, "Function#: 0x%04x\n", func->num);
 
        if (func->num == 2) {
-               bus_if = dev_get_drvdata(&func->card->dev);
+               bus_if = dev_get_drvdata(&func->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);
+               dev_set_drvdata(&func->dev, NULL);
                kfree(bus_if);
                kfree(sdiodev);
        }
@@ -534,15 +538,12 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func)
 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);
+       struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);
        int ret = 0;
 
        brcmf_dbg(TRACE, "\n");
 
-       sdiodev = bus_if->bus_priv;
-
        atomic_set(&sdiodev->suspend, true);
 
        sdio_flags = sdio_get_host_pm_caps(sdiodev->func[1]);
@@ -564,11 +565,9 @@ static int brcmf_sdio_suspend(struct device *dev)
 
 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);
+       struct brcmf_sdio_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/sdio_host.h b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index c4c2543438ec6e6a73faa930987e2176b966dc08..d36a2a855a6573f538089d07985791c7e5d5922d 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@ -135,6 +135,7 @@ struct brcmf_sdio_dev {
        wait_queue_head_t request_chain_wait;
        wait_queue_head_t request_buffer_wait;
        struct device *dev;
+       struct brcmf_bus *bus_if;
 };
 
 /* Register/deregister device interrupt handler. */