From 5df835e80e04b64b74cbdc0dcbaa8b9517f49106 Mon Sep 17 00:00:00 2001 From: Sergio Paracuellos Date: Tue, 3 Apr 2018 17:12:58 +0200 Subject: [PATCH] staging: ks7010: factor out ks_wlan_private init process into ks7010_private_init This commit extract ks_wlan_private initialization process into a new function ks7010_private_init to improve a bit readability. Signed-off-by: Sergio Paracuellos Reviewed-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman --- drivers/staging/ks7010/ks7010_sdio.c | 50 ++++++++++++++++------------ 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c index 98ef6206976d..9af79ac32b1b 100644 --- a/drivers/staging/ks7010/ks7010_sdio.c +++ b/drivers/staging/ks7010/ks7010_sdio.c @@ -848,6 +848,33 @@ static void ks7010_sdio_init_irqs(struct sdio_func *func, netdev_err(priv->net_dev, " err : INT_ENABLE\n"); } +static void ks7010_private_init(struct ks_wlan_private *priv, + struct ks_sdio_card *card, + struct net_device *netdev) +{ + /* private memory initialize */ + priv->ks_sdio_card = card; + + priv->dev_state = DEVICE_STATE_PREBOOT; + priv->net_dev = netdev; + priv->firmware_version[0] = '\0'; + priv->version_size = 0; + priv->last_doze = jiffies; + priv->last_wakeup = jiffies; + memset(&priv->nstats, 0, sizeof(priv->nstats)); + memset(&priv->wstats, 0, sizeof(priv->wstats)); + + /* sleep mode */ + atomic_set(&priv->sleepstatus.doze_request, 0); + atomic_set(&priv->sleepstatus.wakeup_request, 0); + atomic_set(&priv->sleepstatus.wakeup_request, 0); + + trx_device_init(priv); + hostif_init(priv); + ks_wlan_net_start(netdev); + ks7010_init_defaults(priv); +} + static int ks7010_sdio_probe(struct sdio_func *func, const struct sdio_device_id *device) { @@ -903,28 +930,7 @@ static int ks7010_sdio_probe(struct sdio_func *func, card->priv = priv; SET_NETDEV_DEV(netdev, &card->func->dev); /* for create sysfs symlinks */ - /* private memory initialize */ - priv->ks_sdio_card = card; - - priv->dev_state = DEVICE_STATE_PREBOOT; - priv->net_dev = netdev; - priv->firmware_version[0] = '\0'; - priv->version_size = 0; - priv->last_doze = jiffies; - priv->last_wakeup = jiffies; - memset(&priv->nstats, 0, sizeof(priv->nstats)); - memset(&priv->wstats, 0, sizeof(priv->wstats)); - - /* sleep mode */ - atomic_set(&priv->sleepstatus.doze_request, 0); - atomic_set(&priv->sleepstatus.wakeup_request, 0); - atomic_set(&priv->sleepstatus.wakeup_request, 0); - - trx_device_init(priv); - hostif_init(priv); - ks_wlan_net_start(netdev); - - ks7010_init_defaults(priv); + ks7010_private_init(priv, card, netdev); ret = ks7010_upload_firmware(card); if (ret) { -- 2.30.2