Commit d75b81a8 authored by Alessio Igor Bogani's avatar Alessio Igor Bogani Committed by Greg Kroah-Hartman
Browse files

Staging: rt3070: replace __FUNCTION__ usages 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarAlessio Igor Bogani <abogani@texware.it>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a970ff45

drivers/staging/rt3070/2870_main_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ INT MlmeThread( 
	 * This is important in preemption kernels, which transfer the flow

	 * of execution immediately upon a complete().

	 */

	DBGPRINT(RT_DEBUG_TRACE,( "<---%s\n",__FUNCTION__));

	DBGPRINT(RT_DEBUG_TRACE,( "<---%s\n",__func__));



	pObj->MLMEThr_pid = NULL;
@@ -471,7 +471,7 @@ INT TimerQThread( 
	 * This is important in preemption kernels, which transfer the flow

	 * of execution immediately upon a complete().

	 */

	DBGPRINT(RT_DEBUG_TRACE,( "<---%s\n",__FUNCTION__));

	DBGPRINT(RT_DEBUG_TRACE,( "<---%s\n",__func__));



	pObj->TimerQThr_pid = NULL;
@@ -1267,7 +1267,7 @@ BOOLEAN RT28XXProbePostConfig( 


	if (!(pAd->BulkInEpAddr && pAd->BulkOutEpAddr[0]))

	{

		printk("%s: Could not find both bulk-in and bulk-out endpoints\n", __FUNCTION__);

		printk("%s: Could not find both bulk-in and bulk-out endpoints\n", __func__);

		return FALSE;

	}

drivers/staging/rt3070/common/2870_rtmp_init.c

+2 −2
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ PNDIS_PACKET GetPacketFromRxRing( 
	if (pRxWI->MPDUtotalByteCount > ThisFrameLen)

	{

		DBGPRINT(RT_DEBUG_ERROR, ("%s():pRxWIMPDUtotalByteCount(%d) large than RxDMALen(%ld)\n",

									__FUNCTION__, pRxWI->MPDUtotalByteCount, ThisFrameLen));

									__func__, pRxWI->MPDUtotalByteCount, ThisFrameLen));

		goto label_null;

	}

#ifdef RT_BIG_ENDIAN
@@ -1086,7 +1086,7 @@ PNDIS_PACKET GetPacketFromRxRing( 
	pSkb = dev_alloc_skb(ThisFrameLen);

	if (pSkb == NULL)

	{

		DBGPRINT(RT_DEBUG_ERROR,("%s():Cannot Allocate sk buffer for this Bulk-In buffer!\n", __FUNCTION__));

		DBGPRINT(RT_DEBUG_ERROR,("%s():Cannot Allocate sk buffer for this Bulk-In buffer!\n", __func__));

		goto label_null;

	}

drivers/staging/rt3070/common/ba_action.c

+9 −9
Original line number Diff line number Diff line
@@ -592,7 +592,7 @@ VOID BAOriSessionAdd( 


		pBAEntry->ORIBATimer.TimerValue = 0;	//pFrame->TimeOutValue;



		DBGPRINT(RT_DEBUG_TRACE,("%s : TXBAbitmap = %x, BAWinSize = %d, TimeOut = %ld\n", __FUNCTION__, pEntry->TXBAbitmap,

		DBGPRINT(RT_DEBUG_TRACE,("%s : TXBAbitmap = %x, BAWinSize = %d, TimeOut = %ld\n", __func__, pEntry->TXBAbitmap,

								 pBAEntry->BAWinSize, pBAEntry->ORIBATimer.TimerValue));



		// SEND BAR ;
@@ -666,7 +666,7 @@ BOOLEAN BARecSessionAdd( 
		ba_refresh_reordering_mpdus(pAd, pBAEntry);

	}



	DBGPRINT(RT_DEBUG_TRACE,("%s(%ld): Idx = %d, BAWinSize(req %d) = %d\n", __FUNCTION__, pAd->BATable.numAsRecipient, Idx,

	DBGPRINT(RT_DEBUG_TRACE,("%s(%ld): Idx = %d, BAWinSize(req %d) = %d\n", __func__, pAd->BATable.numAsRecipient, Idx,

							 pFrame->BaParm.BufSize, BAWinSize));



	// Start fill in parameters.
@@ -904,7 +904,7 @@ VOID BAOriSessionTearDown( 
		return;

	}



	DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __FUNCTION__, Wcid, TID));

	DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __func__, Wcid, TID));



	pBAEntry = &pAd->BATable.BAOriEntry[Idx];

	DBGPRINT(RT_DEBUG_TRACE,("\t===>Idx = %ld, Wcid=%d.TID=%d, ORI_BA_Status = %d \n", Idx, Wcid, TID, pBAEntry->ORI_BA_Status));
@@ -963,7 +963,7 @@ VOID BARecSessionTearDown( 
	if (Idx == 0)

		return;



	DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __FUNCTION__, Wcid, TID));

	DBGPRINT(RT_DEBUG_TRACE,("%s===>Wcid=%d.TID=%d \n", __func__, Wcid, TID));





	pBAEntry = &pAd->BATable.BARecEntry[Idx];
@@ -1180,7 +1180,7 @@ VOID PeerAddBAReqAction( 
	PULONG      ptemp;

	PMAC_TABLE_ENTRY	pMacEntry;



	DBGPRINT(RT_DEBUG_TRACE, ("%s ==> (Wcid = %d)\n", __FUNCTION__, Elem->Wcid));

	DBGPRINT(RT_DEBUG_TRACE, ("%s ==> (Wcid = %d)\n", __func__, Elem->Wcid));



	//hex_dump("AddBAReq", Elem->Msg, Elem->MsgLen);
@@ -1259,7 +1259,7 @@ VOID PeerAddBAReqAction( 
	MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen);

	MlmeFreeMemory(pAd, pOutBuffer);



	DBGPRINT(RT_DEBUG_TRACE, ("%s(%d): TID(%d), BufSize(%d) <== \n", __FUNCTION__, Elem->Wcid, ADDframe.BaParm.TID,

	DBGPRINT(RT_DEBUG_TRACE, ("%s(%d): TID(%d), BufSize(%d) <== \n", __func__, Elem->Wcid, ADDframe.BaParm.TID,

							  ADDframe.BaParm.BufSize));

}
@@ -1278,7 +1278,7 @@ VOID PeerAddBARspAction( 
	if (Elem->Wcid >= MAX_LEN_OF_MAC_TABLE)

		return;



	DBGPRINT(RT_DEBUG_TRACE, ("%s ==> Wcid(%d)\n", __FUNCTION__, Elem->Wcid));

	DBGPRINT(RT_DEBUG_TRACE, ("%s ==> Wcid(%d)\n", __func__, Elem->Wcid));



	//hex_dump("PeerAddBARspAction()", Elem->Msg, Elem->MsgLen);
@@ -1319,7 +1319,7 @@ VOID PeerDelBAAction( 
	//PUCHAR				pOutBuffer = NULL;

	PFRAME_DELBA_REQ    pDelFrame = NULL;



	DBGPRINT(RT_DEBUG_TRACE,("%s ==>\n", __FUNCTION__));

	DBGPRINT(RT_DEBUG_TRACE,("%s ==>\n", __func__));

	//DELBA Request from unknown peer, ignore this.

	if (PeerDelBAActionSanity(pAd, Elem->Wcid, Elem->Msg, Elem->MsgLen))

	{
@@ -1356,7 +1356,7 @@ BOOLEAN CntlEnqueueForRecv( 


	TID = (UCHAR)pFrame->BARControl.TID;



	DBGPRINT(RT_DEBUG_TRACE, ("%s(): BAR-Wcid(%ld), Tid (%d)\n", __FUNCTION__, Wcid, TID));

	DBGPRINT(RT_DEBUG_TRACE, ("%s(): BAR-Wcid(%ld), Tid (%d)\n", __func__, Wcid, TID));

	//hex_dump("BAR", (PCHAR) pFrame, MsgLen);

	// Do nothing if the driver is starting halt state.

	// This might happen when timer already been fired before cancel timer with mlmehalt

drivers/staging/rt3070/common/cmm_data.c

+1 −1
Original line number Diff line number Diff line
@@ -2114,7 +2114,7 @@ BOOLEAN MacTableDeleteEntry( 
		}

		else

		{

			printk("\n%s: Impossible Wcid = %d !!!!!\n", __FUNCTION__, wcid);

			printk("\n%s: Impossible Wcid = %d !!!!!\n", __func__, wcid);

		}

	}

drivers/staging/rt3070/common/cmm_info.c

+1 −1
Original line number Diff line number Diff line
@@ -2011,7 +2011,7 @@ VOID RTMPIoctlGetMacTable( 
	wrq->u.data.length = sizeof(RT_802_11_MAC_TABLE);

	if (copy_to_user(wrq->u.data.pointer, &MacTab, wrq->u.data.length))

	{

		DBGPRINT(RT_DEBUG_TRACE, ("%s: copy_to_user() fail\n", __FUNCTION__));

		DBGPRINT(RT_DEBUG_TRACE, ("%s: copy_to_user() fail\n", __func__));

	}



	msg = (CHAR *) kmalloc(sizeof(CHAR)*(MAX_LEN_OF_MAC_TABLE*MAC_LINE_LEN), MEM_ALLOC_FLAG);