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

Commit 2ab6fd59 authored by Tobin C. Harding's avatar Tobin C. Harding Committed by Greg Kroah-Hartman
Browse files

staging: ks7010: factor out send stop request 



Function contains compound statement delineated by lone braces. This
statement represents a discreet set of functionality and thus can be
factored out into a separate function. Using a separate function
instead of a compound statement increases readability, reduces code
indentation, reduces function length, and generally looks more tidy.

Factor compound statement out to separate function.

Signed-off-by: default avatarTobin C. Harding <me@tobin.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8641485

drivers/staging/ks7010/ks7010_sdio.c

+32 −20
Original line number Diff line number Diff line
@@ -1042,6 +1042,35 @@ static int ks7010_sdio_probe(struct sdio_func *func, 
	return -ENODEV;

}



/* send stop request to MAC */

static int send_stop_request(struct sdio_func *func)

{

	struct hostif_stop_request_t *pp;

	struct ks_sdio_card *card;

	size_t size;



	card = sdio_get_drvdata(func);



	pp = kzalloc(hif_align_size(sizeof(*pp)), GFP_KERNEL);

	if (!pp) {

		DPRINTK(3, "allocate memory failed..\n");

		return -ENOMEM;

	}



	size = sizeof(*pp) - sizeof(pp->header.size);

	pp->header.size = cpu_to_le16((uint16_t)size);

	pp->header.event = cpu_to_le16((uint16_t)HIF_STOP_REQ);



	sdio_claim_host(func);

	write_to_device(card->priv, (unsigned char *)pp,

			hif_align_size(sizeof(*pp)));

	sdio_release_host(func);



	kfree(pp);

	return 0;

}





static void ks7010_sdio_remove(struct sdio_func *func)

{

	int ret;
@@ -1070,27 +1099,10 @@ static void ks7010_sdio_remove(struct sdio_func *func) 
		sdio_release_host(func);

		DPRINTK(1, "interrupt disable\n");



		/* send stop request to MAC */

		{

			struct hostif_stop_request_t *pp;



			pp = kzalloc(hif_align_size(sizeof(*pp)), GFP_KERNEL);

			if (!pp) {

				DPRINTK(3, "allocate memory failed..\n");

				return;	/* to do goto ni suru */

			}

			pp->header.size =

			    cpu_to_le16((uint16_t)

					(sizeof(*pp) -

					 sizeof(pp->header.size)));

			pp->header.event = cpu_to_le16((uint16_t)HIF_STOP_REQ);

		ret = send_stop_request(func);

		if (ret)	/* memory allocation failure */

			return;



			sdio_claim_host(func);

			write_to_device(priv, (unsigned char *)pp,

					hif_align_size(sizeof(*pp)));

			sdio_release_host(func);

			kfree(pp);

		}

		DPRINTK(1, "STOP Req\n");



		if (priv->ks_wlan_hw.ks7010sdio_wq) {