Commit 7dc1d0cc authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: remove the macro WILC_ERRORCHECK 



This patch removes the macro WILC_ERRORCHECK which is not used
anymore by replacing it with the plain statements.

This patch also removes the WILC_CATCH macros from some of functions not
to make the build warnings.

Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ae43363

drivers/staging/wilc1000/host_interface.c

+2 −1
Original line number Diff line number Diff line
@@ -7247,7 +7247,8 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv) 
	PRINT_D(HOSTINF_DBG, "Setting deleting beacon message queue params\n");



	s32Error = wilc_mq_send(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg));

	WILC_ERRORCHECK(s32Error);

	if (s32Error)

		PRINT_ER("wilc_mq_send fail\n");



	WILC_CATCH(s32Error)

	{

drivers/staging/wilc1000/wilc_errorsupport.h

+0 −7
Original line number Diff line number Diff line
@@ -38,13 +38,6 @@ 






#define WILC_ERRORCHECK(__status__) do { \

		if (__status__ < WILC_SUCCESS) { \

			PRINT_ER("PRINT_ER(%d)\n", __status__);	\

			goto ERRORHANDLER; \

		} \

} while (0)



#define WILC_ERRORREPORT(__status__, __err__) do { \

		PRINT_ER("PRINT_ER(%d)\n", __err__); \

		__status__ = __err__; \

drivers/staging/wilc1000/wilc_msgqueue.c

+4 −1
Original line number Diff line number Diff line
@@ -145,7 +145,10 @@ int wilc_mq_recv(WILC_MsgQueueHandle *pHandle, 
		spin_unlock_irqrestore(&pHandle->strCriticalSection, flags);

	} else {

		/* other non-timeout scenarios */

		WILC_ERRORCHECK(s32RetStatus);

		if (s32RetStatus) {

			PRINT_ER("Non-timeout\n");

			return s32RetStatus;

		}



		if (pHandle->bExiting) {

			WILC_ERRORREPORT(s32RetStatus, WILC_FAIL);

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+8 −16
Original line number Diff line number Diff line
@@ -3233,11 +3233,9 @@ static int stop_ap(struct wiphy *wiphy, struct net_device *dev) 


	s32Error = host_int_del_beacon(priv->hWILCWFIDrv);



	WILC_ERRORCHECK(s32Error);

	if (s32Error)

		PRINT_ER("Host delete beacon fail\n");



	WILC_CATCH(s32Error)

	{

	}

	return s32Error;

}
@@ -3303,12 +3301,10 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev, 
		PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n", strStaParams.u16FlagsSet);



		s32Error = host_int_add_station(priv->hWILCWFIDrv, &strStaParams);

		WILC_ERRORCHECK(s32Error);

		if (s32Error)

			PRINT_ER("Host add station fail\n");

	}



	WILC_CATCH(s32Error)

	{

	}

	return s32Error;

}
@@ -3348,10 +3344,8 @@ static int del_station(struct wiphy *wiphy, struct net_device *dev, 


		s32Error = host_int_del_station(priv->hWILCWFIDrv, mac);



		WILC_ERRORCHECK(s32Error);

	}

	WILC_CATCH(s32Error)

	{

		if (s32Error)

			PRINT_ER("Host delete station fail\n");

	}

	return s32Error;

}
@@ -3419,10 +3413,8 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev, 
		PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n", strStaParams.u16FlagsSet);



		s32Error = host_int_edit_station(priv->hWILCWFIDrv, &strStaParams);

		WILC_ERRORCHECK(s32Error);

	}

	WILC_CATCH(s32Error)

	{

		if (s32Error)

			PRINT_ER("Host edit station fail\n");

	}

	return s32Error;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE