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

drivers/staging: 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
    when strict
return
- ret
+ C
;
// </smpl>

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

drivers/staging/bcm/Bcmchar.c

+1 −2
Original line number Diff line number Diff line
@@ -1849,7 +1849,6 @@ static int bcm_char_ioctl_flash2x_section_bitmap(void __user *argp, 
{

	struct bcm_flash2x_bitmap *psFlash2xBitMap;

	struct bcm_ioctl_buffer IoBuffer;

	INT Status = STATUS_FAILURE;



BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,

	"IOCTL_BCM_GET_FLASH2X_SECTION_BITMAP Called");
@@ -1892,7 +1891,7 @@ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, 
	}



	kfree(psFlash2xBitMap);

	return Status;

	return STATUS_FAILURE;

}



static int bcm_char_ioctl_set_active_section(void __user *argp,

drivers/staging/bcm/InterfaceIdleMode.c

+1 −2
Original line number Diff line number Diff line
@@ -223,7 +223,6 @@ static int InterfaceAbortIdlemode(struct bcm_mini_adapter *Adapter, 
}

int InterfaceIdleModeWakeup(struct bcm_mini_adapter *Adapter)

{

	ULONG	Status = 0;

	if (Adapter->bTriedToWakeUpFromlowPowerMode) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,

		IDLE_MODE, DBG_LVL_ALL,
@@ -233,7 +232,7 @@ int InterfaceIdleModeWakeup(struct bcm_mini_adapter *Adapter) 
		InterfaceAbortIdlemode(Adapter, Adapter->usIdleModePattern);



	}

	return Status;

	return 0;

}



void InterfaceHandleShutdownModeWakeup(struct bcm_mini_adapter *Adapter)

drivers/staging/bcm/PHSModule.c

+3 −6
Original line number Diff line number Diff line
@@ -409,7 +409,6 @@ ULONG PhsUpdateClassifierRule(IN void *pvContext, 
 */

ULONG PhsDeletePHSRule(IN void *pvContext, IN B_UINT16 uiVcid, IN B_UINT8 u8PHSI)

{

	ULONG lStatus = 0;

	UINT nSFIndex = 0, nClsidIndex = 0;

	struct bcm_phs_entry *pstServiceFlowEntry = NULL;

	struct bcm_phs_classifier_table *pstClassifierRulesTable = NULL;
@@ -446,7 +445,7 @@ ULONG PhsDeletePHSRule(IN void *pvContext, IN B_UINT16 uiVcid, IN B_UINT8 u8PHSI 
			}

		}

	}

	return lStatus;

	return 0;

}



/*
@@ -467,7 +466,6 @@ ULONG PhsDeletePHSRule(IN void *pvContext, IN B_UINT16 uiVcid, IN B_UINT8 u8PHSI 
 */

ULONG PhsDeleteClassifierRule(IN void *pvContext, IN B_UINT16 uiVcid, IN B_UINT16 uiClsId)

{

	ULONG lStatus = 0;

	UINT nSFIndex = 0, nClsidIndex = 0;

	struct bcm_phs_entry *pstServiceFlowEntry = NULL;

	struct bcm_phs_classifier_entry *pstClassifierEntry = NULL;
@@ -504,7 +502,7 @@ ULONG PhsDeleteClassifierRule(IN void *pvContext, IN B_UINT16 uiVcid, IN B_UINT1 
			memset(pstClassifierEntry, 0, sizeof(struct bcm_phs_classifier_entry));

		}

	}

	return lStatus;

	return 0;

}



/*
@@ -524,7 +522,6 @@ ULONG PhsDeleteClassifierRule(IN void *pvContext, IN B_UINT16 uiVcid, IN B_UINT1 
 */

ULONG PhsDeleteSFRules(IN void *pvContext, IN B_UINT16 uiVcid)

{

	ULONG lStatus = 0;

	UINT nSFIndex = 0, nClsidIndex = 0;

	struct bcm_phs_entry *pstServiceFlowEntry = NULL;

	struct bcm_phs_classifier_table *pstClassifierRulesTable = NULL;
@@ -573,7 +570,7 @@ ULONG PhsDeleteSFRules(IN void *pvContext, IN B_UINT16 uiVcid) 
		pstServiceFlowEntry->uiVcid = 0;

	}



	return lStatus;

	return 0;

}



/*

drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c

+1 −2
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev, 
{



	int i;

	u8 ret = 0;



	switch (eRFPath) {

	case RF90_PATH_A:
@@ -787,7 +786,7 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device *dev, 
		break;

	}



	return ret;

	return 0;



}

static void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel)

drivers/staging/rtl8192e/rtllib_rx.c

+1 −2
Original line number Diff line number Diff line
@@ -1589,7 +1589,6 @@ static int rtllib_qos_convert_ac_to_parameters(struct rtllib_qos_parameter_info 
{

	struct rtllib_qos_ac_parameter *ac_params;

	struct rtllib_qos_parameters *qos_param = &(qos_data->parameters);

	int rc = 0;

	int i;

	u8 aci;

	u8 acm;
@@ -1640,7 +1639,7 @@ static int rtllib_qos_convert_ac_to_parameters(struct rtllib_qos_parameter_info 
		    (ac_params->aci_aifsn & 0x10) ? 0x01 : 0x00;

		qos_param->tx_op_limit[aci] = ac_params->tx_op_limit;

	}

	return rc;

	return 0;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE