Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fad13228 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville
Browse files

brcmfmac: cleanup helper functions in sdio probe path 



Moving code from helper functions to the calling function
as it makes code easier to read.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bfad4a04

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+34 −56
Original line number Original line Diff line number Diff line
@@ -3750,22 +3750,6 @@ static void brcmf_sdio_dataworker(struct work_struct *work) 
	}

	}

}

}





static bool brcmf_sdio_probe_malloc(struct brcmf_sdio *bus)

{

	brcmf_dbg(TRACE, "Enter\n");



	if (bus->sdiodev->bus_if->maxctl) {

		bus->rxblen =

		    roundup((bus->sdiodev->bus_if->maxctl + SDPCM_HDRLEN),

			    ALIGNMENT) + bus->head_align;

		bus->rxbuf = kmalloc(bus->rxblen, GFP_ATOMIC);

		if (!(bus->rxbuf))

			return false;

	}



	return true;

}



static bool

static bool

brcmf_sdio_probe_attach(struct brcmf_sdio *bus)

brcmf_sdio_probe_attach(struct brcmf_sdio *bus)

{

{
@@ -3879,39 +3863,6 @@ fail: 
	return false;

	return false;

}

}





static bool brcmf_sdio_probe_init(struct brcmf_sdio *bus)

{

	brcmf_dbg(TRACE, "Enter\n");



	sdio_claim_host(bus->sdiodev->func[1]);



	/* Disable F2 to clear any intermediate frame state on the dongle */

	sdio_disable_func(bus->sdiodev->func[SDIO_FUNC_2]);



	bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;

	bus->rxflow = false;



	/* Done with backplane-dependent accesses, can drop clock... */

	brcmf_sdiod_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);



	sdio_release_host(bus->sdiodev->func[1]);



	/* ...and initialize clock/power states */

	bus->clkstate = CLK_SDONLY;

	bus->idletime = BRCMF_IDLE_INTERVAL;

	bus->idleclock = BRCMF_IDLE_ACTIVE;



	/* Query the F2 block size, set roundup accordingly */

	bus->blocksize = bus->sdiodev->func[2]->cur_blksize;

	bus->roundup = min(max_roundup, bus->blocksize);



	/* SR state */

	bus->sleeping = false;

	bus->sr_enabled = false;



	return true;

}



static int

static int

brcmf_sdio_watchdog_thread(void *data)

brcmf_sdio_watchdog_thread(void *data)

{

{
@@ -4039,16 +3990,43 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev) 
	}

	}





	/* Allocate buffers */

	/* Allocate buffers */

	if (!(brcmf_sdio_probe_malloc(bus))) {

	if (bus->sdiodev->bus_if->maxctl) {

		brcmf_err("brcmf_sdio_probe_malloc failed\n");

		bus->rxblen =

		    roundup((bus->sdiodev->bus_if->maxctl + SDPCM_HDRLEN),

			    ALIGNMENT) + bus->head_align;

		bus->rxbuf = kmalloc(bus->rxblen, GFP_ATOMIC);

		if (!(bus->rxbuf)) {

			brcmf_err("rxbuf allocation failed\n");

			goto fail;

			goto fail;

		}

		}



	if (!(brcmf_sdio_probe_init(bus))) {

		brcmf_err("brcmf_sdio_probe_init failed\n");

		goto fail;

	}

	}





	sdio_claim_host(bus->sdiodev->func[1]);



	/* Disable F2 to clear any intermediate frame state on the dongle */

	sdio_disable_func(bus->sdiodev->func[SDIO_FUNC_2]);



	bus->sdiodev->bus_if->state = BRCMF_BUS_DOWN;

	bus->rxflow = false;



	/* Done with backplane-dependent accesses, can drop clock... */

	brcmf_sdiod_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);



	sdio_release_host(bus->sdiodev->func[1]);



	/* ...and initialize clock/power states */

	bus->clkstate = CLK_SDONLY;

	bus->idletime = BRCMF_IDLE_INTERVAL;

	bus->idleclock = BRCMF_IDLE_ACTIVE;



	/* Query the F2 block size, set roundup accordingly */

	bus->blocksize = bus->sdiodev->func[2]->cur_blksize;

	bus->roundup = min(max_roundup, bus->blocksize);



	/* SR state */

	bus->sleeping = false;

	bus->sr_enabled = false;



	brcmf_sdio_debugfs_create(bus);

	brcmf_sdio_debugfs_create(bus);

	brcmf_dbg(INFO, "completed!!\n");

	brcmf_dbg(INFO, "completed!!\n");