diff options
| author | Hante Meuleman <meuleman@broadcom.com> | 2016-02-17 13:27:08 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-03-07 15:15:56 +0300 |
| commit | af5b5e62f72e08e6e7e3d3cd78ee7e4cec96f7c8 (patch) | |
| tree | b747c035ea2b349ff8ad29510d49870d026fbc05 /drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | |
| parent | 4d7928959832ea41f7f91456b76da19cad01bd09 (diff) | |
| download | linux-af5b5e62f72e08e6e7e3d3cd78ee7e4cec96f7c8.tar.xz | |
brcmfmac: merge platform data and module paramaters
Merge module parameters and platform data in one struct. This is the
last step to move to the new platform data per device. Now parameters
of platform data will be merged with module parameters per device.
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c')
| -rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c index ece0b65dd039..425c41dc0a59 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c @@ -23,7 +23,7 @@ #include "common.h" #include "of.h" -void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd **sdio) +void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd *sdio) { struct device_node *np = dev->of_node; int irq; @@ -33,12 +33,8 @@ void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd **sdio) if (!np || !of_device_is_compatible(np, "brcm,bcm4329-fmac")) return; - *sdio = devm_kzalloc(dev, sizeof(*sdio), GFP_KERNEL); - if (!(*sdio)) - return; - if (of_property_read_u32(np, "brcm,drive-strength", &val) == 0) - (*sdio)->drive_strength = val; + sdio->drive_strength = val; /* make sure there are interrupts defined in the node */ if (!of_find_property(np, "interrupts", NULL)) @@ -51,7 +47,7 @@ void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd **sdio) } irqf = irqd_get_trigger_type(irq_get_irq_data(irq)); - (*sdio)->oob_irq_supported = true; - (*sdio)->oob_irq_nr = irq; - (*sdio)->oob_irq_flags = irqf; + sdio->oob_irq_supported = true; + sdio->oob_irq_nr = irq; + sdio->oob_irq_flags = irqf; } |