Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c804f592 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Remove useless return variables 



This patch remove variables that are initialized with a constant,
are never updated, and are only used as parameter of return.
Return the constant instead of using a variable.

Verified by compilation only.

The coccinelle script that find and fixes this issue is:
// <smpl>
@@
type T;
constant C;
identifier ret;
@@
- T ret = C;
... when != ret
- return ret;
+ return C;
// </smpl>

Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e7935ab

drivers/staging/vt6655/hostap.c

+4 −6
Original line number Diff line number Diff line
@@ -421,7 +421,6 @@ static int hostap_set_encryption(PSDevice pDevice, 
	unsigned char abySeq[MAX_KEY_LEN];

	unsigned long long KeyRSC;

	unsigned char byKeyDecMode = KEY_CTL_WEP;

	int     ret = 0;

	int     iNodeIndex = -1;

	int     ii;

	bool bKeyTableFull = false;
@@ -475,7 +474,7 @@ static int hostap_set_encryption(PSDevice pDevice, 
		       MAX_KEY_LEN

);



		return ret;

		return 0;

	}



	memcpy(abyKey, param->u.crypt.key, param->u.crypt.key_len);
@@ -531,7 +530,7 @@ static int hostap_set_encryption(PSDevice pDevice, 
		pMgmt->byCSSGK = KEY_CTL_WEP;

		pMgmt->sNodeDBTable[iNodeIndex].byCipherSuite = KEY_CTL_WEP;

		pMgmt->sNodeDBTable[iNodeIndex].dwKeyIndex = dwKeyIndex;

		return ret;

		return 0;

	}



	if (param->u.crypt.seq) {
@@ -622,7 +621,7 @@ static int hostap_set_encryption(PSDevice pDevice, 
	pMgmt->sNodeDBTable[iNodeIndex].dwTSC47_16 = 0;

	pMgmt->sNodeDBTable[iNodeIndex].wTSC15_0 = 0;



	return ret;

	return 0;

}



/*
@@ -643,7 +642,6 @@ static int hostap_get_encryption(PSDevice pDevice, 
				 int param_len)

{

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	int     ret = 0;

	int     ii;

	int     iNodeIndex = 0;
@@ -663,7 +661,7 @@ static int hostap_get_encryption(PSDevice pDevice, 
	for (ii = 0; ii < 8; ii++)

		param->u.crypt.seq[ii] = (unsigned char)pMgmt->sNodeDBTable[iNodeIndex].KeyRSC >> (ii * 8);



	return ret;

	return 0;

}



/*

drivers/staging/vt6655/wpactl.c

+6 −13
Original line number Diff line number Diff line
@@ -411,12 +411,11 @@ static int wpa_set_wpa(PSDevice pDevice, 
		       struct viawget_wpa_param *param)

{

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	int ret = 0;



	pMgmt->eAuthenMode = WMAC_AUTH_OPEN;

	pMgmt->bShareKeyAlgorithm = false;



	return ret;

	return 0;

}



/*
@@ -437,7 +436,6 @@ static int wpa_set_disassociate(PSDevice pDevice, 
				struct viawget_wpa_param *param)

{

	PSMgmtObject    pMgmt = pDevice->pMgmt;

	int ret = 0;



	spin_lock_irq(&pDevice->lock);

	if (pDevice->bLinkPass) {
@@ -446,7 +444,7 @@ static int wpa_set_disassociate(PSDevice pDevice, 
	}

	spin_unlock_irq(&pDevice->lock);



	return ret;

	return 0;

}



/*
@@ -466,14 +464,12 @@ static int wpa_set_disassociate(PSDevice pDevice, 
static int wpa_set_scan(PSDevice pDevice,

			struct viawget_wpa_param *param)

{

	int ret = 0;



	spin_lock_irq(&pDevice->lock);

	BSSvClearBSSList((void *)pDevice, pDevice->bLinkPass);

	bScheduleCommand((void *)pDevice, WLAN_CMD_BSSID_SCAN, NULL);

	spin_unlock_irq(&pDevice->lock);



	return ret;

	return 0;

}



/*
@@ -494,11 +490,10 @@ static int wpa_get_bssid(PSDevice pDevice, 
			 struct viawget_wpa_param *param)

{

	PSMgmtObject        pMgmt = pDevice->pMgmt;

	int ret = 0;



	memcpy(param->u.wpa_associate.bssid, pMgmt->abyCurrBSSID , 6);



	return ret;

	return 0;

}



/*
@@ -520,14 +515,13 @@ static int wpa_get_ssid(PSDevice pDevice, 
{

	PSMgmtObject        pMgmt = pDevice->pMgmt;

	PWLAN_IE_SSID       pItemSSID;

	int ret = 0;



	pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;



	memcpy(param->u.wpa_associate.ssid, pItemSSID->abySSID , pItemSSID->len);

	param->u.wpa_associate.ssid_len = pItemSSID->len;



	return ret;

	return 0;

}



/*
@@ -668,7 +662,6 @@ static int wpa_set_associate(PSDevice pDevice, 
	PWLAN_IE_SSID   pItemSSID;

	unsigned char abyNullAddr[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};

	unsigned char abyWPAIE[64];

	int ret = 0;

	bool bWepEnabled = false;



	// set key type & algorithm
@@ -788,7 +781,7 @@ static int wpa_set_associate(PSDevice pDevice, 
	bScheduleCommand((void *)pDevice, WLAN_CMD_SSID, NULL);

	spin_unlock_irq(&pDevice->lock);



	return ret;

	return 0;

}



/*