Commit 6e6156f6 authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: ks7010: factor out initial enqueue process into ks7010_sme_enqueue_events 



This commit extract initial enqueue process into a new
ks7010_sme_enqueue_events function.

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 5df835e8

drivers/staging/ks7010/ks7010_sdio.c

+19 −14
Original line number Diff line number Diff line
@@ -730,21 +730,8 @@ static int ks7010_upload_firmware(struct ks_sdio_card *card) 
	return ret;

}



static void ks7010_card_init(struct ks_wlan_private *priv)

static void ks7010_sme_enqueue_events(struct ks_wlan_private *priv)

{

	init_completion(&priv->confirm_wait);



	/* get mac address & firmware version */

	hostif_sme_enqueue(priv, SME_START);



	if (!wait_for_completion_interruptible_timeout

	    (&priv->confirm_wait, 5 * HZ)) {

		netdev_dbg(priv->net_dev, "wait time out!! SME_START\n");

	}



	if (priv->mac_address_valid && priv->version_size != 0)

		priv->dev_state = DEVICE_STATE_PREINIT;



	hostif_sme_enqueue(priv, SME_GET_EEPROM_CKSUM);



	/* load initial wireless parameter */
@@ -763,6 +750,24 @@ static void ks7010_card_init(struct ks_wlan_private *priv) 
	hostif_sme_enqueue(priv, SME_RSN_ENABLED_REQUEST);

	hostif_sme_enqueue(priv, SME_MODE_SET_REQUEST);

	hostif_sme_enqueue(priv, SME_START_REQUEST);

}



static void ks7010_card_init(struct ks_wlan_private *priv)

{

	init_completion(&priv->confirm_wait);



	/* get mac address & firmware version */

	hostif_sme_enqueue(priv, SME_START);



	if (!wait_for_completion_interruptible_timeout

	    (&priv->confirm_wait, 5 * HZ)) {

		netdev_dbg(priv->net_dev, "wait time out!! SME_START\n");

	}



	if (priv->mac_address_valid && priv->version_size != 0)

		priv->dev_state = DEVICE_STATE_PREINIT;



	ks7010_sme_enqueue_events(priv);



	if (!wait_for_completion_interruptible_timeout

	    (&priv->confirm_wait, 5 * HZ)) {