| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748 |
- From: Arend van Spriel <[email protected]>
- Date: Wed, 11 Mar 2015 16:11:27 +0100
- Subject: [PATCH] brcmfmac: remove duplication of ramsize info
- Removing the ramsize from the brcmf_sdio structure to avoid
- duplication. The information is available in brcmf_chip
- structure.
- Reviewed-by: Hante Meuleman <[email protected]>
- Reviewed-by: Pieter-Paul Giesberts <[email protected]>
- Signed-off-by: Arend van Spriel <[email protected]>
- Signed-off-by: Kalle Valo <[email protected]>
- ---
- --- a/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
- +++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio.c
- @@ -432,8 +432,6 @@ struct brcmf_sdio {
- struct brcmf_sdio_dev *sdiodev; /* sdio device handler */
- struct brcmf_chip *ci; /* Chip info struct */
-
- - u32 ramsize; /* Size of RAM in SOCRAM (bytes) */
- -
- u32 hostintmask; /* Copy of Host Interrupt Mask */
- atomic_t intstatus; /* Intstatus bits (events) pending */
- atomic_t fcstate; /* State of dongle flow-control */
- @@ -1075,7 +1073,7 @@ static int brcmf_sdio_readshared(struct
- struct sdpcm_shared_le sh_le;
- __le32 addr_le;
-
- - shaddr = bus->ci->rambase + bus->ramsize - 4;
- + shaddr = bus->ci->rambase + bus->ci->ramsize - 4;
-
- /*
- * Read last word in socram to determine
- @@ -3871,13 +3869,6 @@ brcmf_sdio_probe_attach(struct brcmf_sdi
- drivestrength = DEFAULT_SDIO_DRIVE_STRENGTH;
- brcmf_sdio_drivestrengthinit(bus->sdiodev, bus->ci, drivestrength);
-
- - /* Get info on the SOCRAM cores... */
- - bus->ramsize = bus->ci->ramsize;
- - if (!(bus->ramsize)) {
- - brcmf_err("failed to find SOCRAM memory!\n");
- - goto fail;
- - }
- -
- /* Set card control so an SDIO card reset does a WLAN backplane reset */
- reg_val = brcmf_sdiod_regrb(bus->sdiodev,
- SDIO_CCCR_BRCM_CARDCTRL, &err);
|
