Commit 0e80e31a authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: ks7010: factor out irq enable process to ks7010_sdio_init_irqs 



This commit extracts sdio irq enable process to a new function
ks7010_sdio_init_irqs to improve 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 cea78d61

drivers/staging/ks7010/ks7010_sdio.c

+27 −16
Original line number Diff line number Diff line
@@ -802,13 +802,38 @@ static void ks7010_init_defaults(struct ks_wlan_private *priv) 
	priv->reg.rate_set.size = 12;

}



static void ks7010_sdio_init_irqs(struct sdio_func *func,

				  struct ks_wlan_private *priv)

{

	unsigned char byte;

	int ret;



	/*

	 * interrupt setting

	 * clear Interrupt status write

	 * (ARMtoSD_InterruptPending FN1:00_0024)

	 */

	sdio_claim_host(func);

	ret = ks7010_sdio_writeb(priv, INT_PENDING, 0xff);

	sdio_release_host(func);

	if (ret)

		netdev_err(priv->net_dev, " error : INT_PENDING\n");



	/* enable ks7010sdio interrupt */

	byte = (INT_GCR_B | INT_READ_STATUS | INT_WRITE_STATUS);

	sdio_claim_host(func);

	ret = ks7010_sdio_writeb(priv, INT_ENABLE, byte);

	sdio_release_host(func);

	if (ret)

		netdev_err(priv->net_dev, " err : INT_ENABLE\n");

}



static int ks7010_sdio_probe(struct sdio_func *func,

			     const struct sdio_device_id *device)

{

	struct ks_wlan_private *priv;

	struct ks_sdio_card *card;

	struct net_device *netdev;

	unsigned char byte;

	int ret;



	priv = NULL;
@@ -898,21 +923,7 @@ static int ks7010_sdio_probe(struct sdio_func *func, 
		goto err_free_netdev;

	}



	/* interrupt setting */

	/* clear Interrupt status write (ARMtoSD_InterruptPending FN1:00_0024) */

	sdio_claim_host(func);

	ret = ks7010_sdio_writeb(priv, INT_PENDING, 0xff);

	sdio_release_host(func);

	if (ret)

		netdev_err(priv->net_dev, " error : INT_PENDING\n");



	/* enable ks7010sdio interrupt */

	byte = (INT_GCR_B | INT_READ_STATUS | INT_WRITE_STATUS);

	sdio_claim_host(func);

	ret = ks7010_sdio_writeb(priv, INT_ENABLE, byte);

	sdio_release_host(func);

	if (ret)

		netdev_err(priv->net_dev, " err : INT_ENABLE\n");

	ks7010_sdio_init_irqs(func, priv);



	priv->dev_state = DEVICE_STATE_BOOT;