staging: ks7010: factor out ks_wlan_private init process into ks7010_private_init
authorSergio Paracuellos <sergio.paracuellos@gmail.com>
Tue, 3 Apr 2018 15:12:58 +0000 (17:12 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Apr 2018 12:22:07 +0000 (14:22 +0200)
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 <sergio.paracuellos@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ks7010/ks7010_sdio.c

index 98ef6206976d587440acd0425b1bfdf90b55e7bf..9af79ac32b1bb7d3acd09f93b25984045eebb87b 100644 (file)
@@ -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) {