iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: ks7010: factor out send stop request

Browse Source 
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: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tobin C. Harding 2017-04-10 13:15:47 +10:00 committed by Greg Kroah-Hartman
parent f8641485ff
commit 2ab6fd5963
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/staging/ks7010/ks7010_sdio.c
View File

@ -1042,6 +1042,35 @@ static int ks7010_sdio_probe(struct sdio_func *func,
return -ENODEV; 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) static void ks7010_sdio_remove(struct sdio_func *func)
{ {
int ret; int ret;
@ -1070,27 +1099,10 @@ static void ks7010_sdio_remove(struct sdio_func *func)
sdio_release_host(func); sdio_release_host(func);
DPRINTK(1, "interrupt disable\n"); DPRINTK(1, "interrupt disable\n");
/* send stop request to MAC */ ret = send_stop_request(func);
{ if (ret) /* memory allocation failure */
struct hostif_stop_request_t *pp; return;
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);
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"); DPRINTK(1, "STOP Req\n");
if (priv->ks_wlan_hw.ks7010sdio_wq) { if (priv->ks_wlan_hw.ks7010sdio_wq) {