Re: [PATCH 33/34] brcmfmac: Remove array of functions

[Arend van Spriel]

On 26-07-17 22:25, Ian Molton wrote:
> Replace the array of functions with a pair of pointers to the
>  relevant functions.

Acked-by: Arend van Spriel 
> Signed-off-by: Ian Molton 
> 
> # Conflicts:
> # drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
> # drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> ---
>  .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c  | 117 +++
>  .../wireless/broadcom/brcm80211/brcmfmac/sdio.c| 166 
> ++---
>  .../wireless/broadcom/brcm80211/brcmfmac/sdio.h|  15 +-
>  3 files changed, 146 insertions(+), 152 deletions(-)

[PATCH 33/34] brcmfmac: Remove array of functions

[Ian Molton]

Replace the array of functions with a pair of pointers to the
 relevant functions.

Signed-off-by: Ian Molton 

# Conflicts:
#   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
#   drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
---
 .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c  | 117 +++
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c| 166 ++---
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.h|  15 +-
 3 files changed, 146 insertions(+), 152 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 5787348003d9..8cfd2cbb1dfa 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -118,7 +118,7 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev 
*sdiodev)
 
ret = request_irq(pdata->oob_irq_nr, brcmf_sdiod_oob_irqhandler,
  pdata->oob_irq_flags, "brcmf_oob_intr",
- >func[1]->dev);
+ >func1->dev);
if (ret != 0) {
brcmf_err("request_irq failed %d\n", ret);
return ret;
@@ -132,7 +132,7 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev 
*sdiodev)
}
sdiodev->irq_wake = true;
 
-   sdio_claim_host(sdiodev->func[1]);
+   sdio_claim_host(sdiodev->func1);
 
if (sdiodev->bus_if->chip == BRCM_CC_43362_CHIP_ID) {
/* assign GPIO to SDIO core */
@@ -157,13 +157,13 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev 
*sdiodev)
if (pdata->oob_irq_flags & IRQF_TRIGGER_HIGH)
data |= SDIO_SEPINT_ACT_HI;
brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, 
);
-   sdio_release_host(sdiodev->func[1]);
+   sdio_release_host(sdiodev->func1);
} else {
brcmf_dbg(SDIO, "Entering\n");
-   sdio_claim_host(sdiodev->func[1]);
-   sdio_claim_irq(sdiodev->func[1], brcmf_sdiod_ib_irqhandler);
-   sdio_claim_irq(sdiodev->func[2], brcmf_sdiod_dummy_irqhandler);
-   sdio_release_host(sdiodev->func[1]);
+   sdio_claim_host(sdiodev->func1);
+   sdio_claim_irq(sdiodev->func1, brcmf_sdiod_ib_irqhandler);
+   sdio_claim_irq(sdiodev->func2, brcmf_sdiod_dummy_irqhandler);
+   sdio_release_host(sdiodev->func1);
sdiodev->sd_irq_requested = true;
}
 
@@ -181,26 +181,26 @@ void brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev 
*sdiodev)
struct brcmfmac_sdio_pd *pdata;
 
pdata = >settings->bus.sdio;
-   sdio_claim_host(sdiodev->func[1]);
+   sdio_claim_host(sdiodev->func1);
brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_BRCM_SEPINT, 0, NULL);
brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_IENx, 0, NULL);
-   sdio_release_host(sdiodev->func[1]);
+   sdio_release_host(sdiodev->func1);
 
sdiodev->oob_irq_requested = false;
if (sdiodev->irq_wake) {
disable_irq_wake(pdata->oob_irq_nr);
sdiodev->irq_wake = false;
}
-   free_irq(pdata->oob_irq_nr, >func[1]->dev);
+   free_irq(pdata->oob_irq_nr, >func1->dev);
sdiodev->irq_en = false;
sdiodev->oob_irq_requested = false;
}
 
if (sdiodev->sd_irq_requested) {
-   sdio_claim_host(sdiodev->func[1]);
-   sdio_release_irq(sdiodev->func[2]);
-   sdio_release_irq(sdiodev->func[1]);
-   sdio_release_host(sdiodev->func[1]);
+   sdio_claim_host(sdiodev->func1);
+   sdio_release_irq(sdiodev->func2);
+   sdio_release_irq(sdiodev->func1);
+   sdio_release_host(sdiodev->func1);
sdiodev->sd_irq_requested = false;
}
 }
@@ -263,7 +263,7 @@ u32 brcmf_sdiod_readl(struct brcmf_sdio_dev *sdiodev, u32 
addr, int *ret)
addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 
if (!retval)
-   data = sdio_readl(sdiodev->func[1], addr, );
+   data = sdio_readl(sdiodev->func1, addr, );
 
 out:
if (ret)
@@ -285,7 +285,7 @@ void brcmf_sdiod_writel(struct brcmf_sdio_dev *sdiodev, u32 
addr,
addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 
if (!retval)
-   sdio_writel(sdiodev->func[1], data, addr, );
+   sdio_writel(sdiodev->func1, data, addr, );
 
 out:
if (ret)
@@ -548,7 +548,7 @@ int brcmf_sdiod_recv_pkt(struct brcmf_sdio_dev *sdiodev, 
struct sk_buff *pkt)
addr &= SBSDIO_SB_OFT_ADDR_MASK;
addr |= 

[PATCH 33/34] brcmfmac: Remove array of functions

[Ian Molton]

Replace the array of functions with a pair of pointers to the
 relevant functions.

Signed-off-by: Ian Molton 
---
 .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c  | 115 +++
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c| 164 ++---
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.h|  15 +-
 3 files changed, 144 insertions(+), 150 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c 
b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 43a9c28738b3..d9fe2faf2b04 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -118,7 +118,7 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev 
*sdiodev)
 
ret = request_irq(pdata->oob_irq_nr, brcmf_sdiod_oob_irqhandler,
  pdata->oob_irq_flags, "brcmf_oob_intr",
- >func[1]->dev);
+ >func1->dev);
if (ret != 0) {
brcmf_err("request_irq failed %d\n", ret);
return ret;
@@ -132,7 +132,7 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev 
*sdiodev)
}
sdiodev->irq_wake = true;
 
-   sdio_claim_host(sdiodev->func[1]);
+   sdio_claim_host(sdiodev->func1);
 
if (sdiodev->bus_if->chip == BRCM_CC_43362_CHIP_ID) {
/* assign GPIO to SDIO core */
@@ -156,13 +156,13 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev 
*sdiodev)
if (pdata->oob_irq_flags & IRQF_TRIGGER_HIGH)
data |= SDIO_SEPINT_ACT_HI;
brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, 
);
-   sdio_release_host(sdiodev->func[1]);
+   sdio_release_host(sdiodev->func1);
} else {
brcmf_dbg(SDIO, "Entering\n");
-   sdio_claim_host(sdiodev->func[1]);
-   sdio_claim_irq(sdiodev->func[1], brcmf_sdiod_ib_irqhandler);
-   sdio_claim_irq(sdiodev->func[2], brcmf_sdiod_dummy_irqhandler);
-   sdio_release_host(sdiodev->func[1]);
+   sdio_claim_host(sdiodev->func1);
+   sdio_claim_irq(sdiodev->func1, brcmf_sdiod_ib_irqhandler);
+   sdio_claim_irq(sdiodev->func2, brcmf_sdiod_dummy_irqhandler);
+   sdio_release_host(sdiodev->func1);
sdiodev->sd_irq_requested = true;
}
 
@@ -180,26 +180,26 @@ void brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev 
*sdiodev)
struct brcmfmac_sdio_pd *pdata;
 
pdata = >settings->bus.sdio;
-   sdio_claim_host(sdiodev->func[1]);
+   sdio_claim_host(sdiodev->func1);
brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_BRCM_SEPINT, 0, NULL);
brcmf_sdiod_func0_wb(sdiodev, SDIO_CCCR_IENx, 0, NULL);
-   sdio_release_host(sdiodev->func[1]);
+   sdio_release_host(sdiodev->func1);
 
sdiodev->oob_irq_requested = false;
if (sdiodev->irq_wake) {
disable_irq_wake(pdata->oob_irq_nr);
sdiodev->irq_wake = false;
}
-   free_irq(pdata->oob_irq_nr, >func[1]->dev);
+   free_irq(pdata->oob_irq_nr, >func1->dev);
sdiodev->irq_en = false;
sdiodev->oob_irq_requested = false;
}
 
if (sdiodev->sd_irq_requested) {
-   sdio_claim_host(sdiodev->func[1]);
-   sdio_release_irq(sdiodev->func[2]);
-   sdio_release_irq(sdiodev->func[1]);
-   sdio_release_host(sdiodev->func[1]);
+   sdio_claim_host(sdiodev->func1);
+   sdio_release_irq(sdiodev->func2);
+   sdio_release_irq(sdiodev->func1);
+   sdio_release_host(sdiodev->func1);
sdiodev->sd_irq_requested = false;
}
 }
@@ -261,7 +261,7 @@ u32 brcmf_sdiod_readl(struct brcmf_sdio_dev *sdiodev, u32 
addr, int *ret)
addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 
if (!retval)
-   data = sdio_readl(sdiodev->func[1], addr, );
+   data = sdio_readl(sdiodev->func1, addr, );
 
 out:
if (ret)
@@ -283,7 +283,7 @@ void brcmf_sdiod_writel(struct brcmf_sdio_dev *sdiodev, u32 
addr,
addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 
if (!retval)
-   sdio_writel(sdiodev->func[1], data, addr, );
+   sdio_writel(sdiodev->func1, data, addr, );
 
 out:
if (ret)
@@ -541,7 +541,7 @@ int brcmf_sdiod_recv_pkt(struct brcmf_sdio_dev *sdiodev, 
struct sk_buff *pkt)
addr &= SBSDIO_SB_OFT_ADDR_MASK;
addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;
 
-   err = brcmf_sdiod_buff_read(sdiodev, sdiodev->func[2], addr, pkt);
+   err = brcmf_sdiod_buff_read(sdiodev,