Commit f8628a47 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

staging: Convert __FUNCTION__ to __func__ 



Use the normal mechanism for emitting a function name.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 91d435fe

drivers/staging/bcm/Qos.c

+7 −7
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ static bool EthCSMatchSrcMACAddress(struct bcm_classifier_rule *pstClassifierRul 
	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);

	if (pstClassifierRule->ucEthCSSrcMACLen == 0)

		return TRUE;

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s\n", __FUNCTION__);

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s\n", __func__);

	for (i = 0; i < MAC_ADDRESS_SIZE; i++) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "SRC MAC[%x] = %x ClassifierRuleSrcMAC = %x Mask : %x\n", i, Mac[i], pstClassifierRule->au8EThCSSrcMAC[i], pstClassifierRule->au8EThCSSrcMACMask[i]);

		if ((pstClassifierRule->au8EThCSSrcMAC[i] & pstClassifierRule->au8EThCSSrcMACMask[i]) !=
@@ -607,7 +607,7 @@ static bool EthCSMatchDestMACAddress(struct bcm_classifier_rule *pstClassifierRu 
	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);

	if (pstClassifierRule->ucEthCSDestMACLen == 0)

		return TRUE;

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s\n", __FUNCTION__);

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "%s\n", __func__);

	for (i = 0; i < MAC_ADDRESS_SIZE; i++) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "SRC MAC[%x] = %x ClassifierRuleSrcMAC = %x Mask : %x\n", i, Mac[i], pstClassifierRule->au8EThCSDestMAC[i], pstClassifierRule->au8EThCSDestMACMask[i]);

		if ((pstClassifierRule->au8EThCSDestMAC[i] & pstClassifierRule->au8EThCSDestMACMask[i]) !=
@@ -624,9 +624,9 @@ static bool EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule, 
		(pstClassifierRule->au8EthCSEtherType[0] == 0))

		return TRUE;



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s SrcEtherType:%x CLS EtherType[0]:%x\n", __FUNCTION__, pstEthCsPktInfo->usEtherType, pstClassifierRule->au8EthCSEtherType[0]);

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s SrcEtherType:%x CLS EtherType[0]:%x\n", __func__, pstEthCsPktInfo->usEtherType, pstClassifierRule->au8EthCSEtherType[0]);

	if (pstClassifierRule->au8EthCSEtherType[0] == 1) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  CLS EtherType[1]:%x EtherType[2]:%x\n", __FUNCTION__, pstClassifierRule->au8EthCSEtherType[1], pstClassifierRule->au8EthCSEtherType[2]);

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  CLS EtherType[1]:%x EtherType[2]:%x\n", __func__, pstClassifierRule->au8EthCSEtherType[1], pstClassifierRule->au8EthCSEtherType[2]);



		if (memcmp(&pstEthCsPktInfo->usEtherType, &pstClassifierRule->au8EthCSEtherType[1], 2) == 0)

			return TRUE;
@@ -638,7 +638,7 @@ static bool EthCSMatchEThTypeSAP(struct bcm_classifier_rule *pstClassifierRule, 
		if (eEth802LLCFrame != pstEthCsPktInfo->eNwpktEthFrameType)

			return false;



		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  EthCS DSAP:%x EtherType[2]:%x\n", __FUNCTION__, pstEthCsPktInfo->ucDSAP, pstClassifierRule->au8EthCSEtherType[2]);

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  EthCS DSAP:%x EtherType[2]:%x\n", __func__, pstEthCsPktInfo->ucDSAP, pstClassifierRule->au8EthCSEtherType[2]);

		if (pstEthCsPktInfo->ucDSAP == pstClassifierRule->au8EthCSEtherType[2])

			return TRUE;

		else
@@ -657,7 +657,7 @@ static bool EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule, s 
	B_UINT8 uPriority = 0;

	struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);



	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  CLS UserPrio:%x CLS VLANID:%x\n", __FUNCTION__, ntohs(*((USHORT *)pstClassifierRule->usUserPriority)), pstClassifierRule->usVLANID);

	BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  CLS UserPrio:%x CLS VLANID:%x\n", __func__, ntohs(*((USHORT *)pstClassifierRule->usUserPriority)), pstClassifierRule->usVLANID);



	/* In case FW didn't receive the TLV, the priority field should be ignored */

	if (pstClassifierRule->usValidityBitMap & (1<<PKT_CLASSIFICATION_USER_PRIORITY_VALID)) {
@@ -683,7 +683,7 @@ static bool EthCSMatchVLANRules(struct bcm_classifier_rule *pstClassifierRule, s 


		usVLANID = ntohs(*(USHORT *)(skb->data + sizeof(struct bcm_eth_header))) & 0xFFF;



		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  Pkt VLANID %x Priority: %d\n", __FUNCTION__, usVLANID, uPriority);

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "%s  Pkt VLANID %x Priority: %d\n", __func__, usVLANID, uPriority);



		if (usVLANID == ((pstClassifierRule->usVLANID & 0xFFF0) >> 4))

			bClassificationSucceed = TRUE;

drivers/staging/keucr/scsiglue.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static int queuecommand_lck(struct scsi_cmnd *srb, 
	/* check for state-transition errors */

	if (us->srb != NULL) {

		/* pr_info("Error in %s: us->srb = %p\n"

				 __FUNCTION__, us->srb); */

				 __func__, us->srb); */

		return SCSI_MLQUEUE_HOST_BUSY;

	}

drivers/staging/octeon-usb/octeon-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -1546,7 +1546,7 @@ static void __cvmx_usb_start_channel_control(struct cvmx_usb_state *usb, 
	switch (transaction->stage) {

	case CVMX_USB_STAGE_NON_CONTROL:

	case CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE:

		cvmx_dprintf("%s: ERROR - Non control stage\n", __FUNCTION__);

		cvmx_dprintf("%s: ERROR - Non control stage\n", __func__);

		break;

	case CVMX_USB_STAGE_SETUP:

		usbc_hctsiz.s.pid = 3; /* Setup */

drivers/staging/rtl8192u/ieee80211/ieee80211.h

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ do { if (ieee80211_debug_level & (level)) \ 
		{	\

			int i;					\

			u8 *pdata = (u8 *) data;			\

			printk(KERN_DEBUG "ieee80211: %s()\n", __FUNCTION__);	\

			printk(KERN_DEBUG "ieee80211: %s()\n", __func__);	\

			for(i=0; i<(int)(datalen); i++)			\

			{						\

				printk("%2x ", pdata[i]);		\

drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static char *ieee80211_ccmp_print_stats(char *p, void *priv) 


void ieee80211_ccmp_null(void)

{

//    printk("============>%s()\n", __FUNCTION__);

//    printk("============>%s()\n", __func__);

	return;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE