Commit 5df835e8 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman

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: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d4ab8f7
...@@ -848,6 +848,33 @@ static void ks7010_sdio_init_irqs(struct sdio_func *func, ...@@ -848,6 +848,33 @@ static void ks7010_sdio_init_irqs(struct sdio_func *func,
netdev_err(priv->net_dev, " err : INT_ENABLE\n"); 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, static int ks7010_sdio_probe(struct sdio_func *func,
const struct sdio_device_id *device) const struct sdio_device_id *device)
{ {
...@@ -903,28 +930,7 @@ static int ks7010_sdio_probe(struct sdio_func *func, ...@@ -903,28 +930,7 @@ static int ks7010_sdio_probe(struct sdio_func *func,
card->priv = priv; card->priv = priv;
SET_NETDEV_DEV(netdev, &card->func->dev); /* for create sysfs symlinks */ SET_NETDEV_DEV(netdev, &card->func->dev); /* for create sysfs symlinks */
/* private memory initialize */ ks7010_private_init(priv, card, netdev);
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);
ret = ks7010_upload_firmware(card); ret = ks7010_upload_firmware(card);
if (ret) { if (ret) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment