Commit 097f4c19 authored by Ken Cox's avatar Ken Cox Committed by Greg Kroah-Hartman
Browse files

Staging: unisys: Remove RETVOID macro 



The RETVOID macro contained a goto statement which is not allowed in
the kernel.

Signed-off-by: default avatarKen Cox <jkc@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9355f89

drivers/staging/unisys/include/timskmod.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -122,8 +122,6 @@ typedef long VMMIO32;/**< #VMMIO pointing to 32-bit data */ 
#define RETTRACE(x)

#define RETTRACE(x)

#endif

#endif





/** return from a void function, using a common exit point "Away" */

#define RETVOID    do { RETTRACE(0); goto Away; } while (0)

/** return from an int function, using a common exit point "Away"

/** return from an int function, using a common exit point "Away"

 *  @param x the value to return

 *  @param x the value to return

 */

 */

drivers/staging/unisys/uislib/uisqueue.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ 
#define CURRENT_FILE_PC UISLIB_PC_uisqueue_c

#define CURRENT_FILE_PC UISLIB_PC_uisqueue_c

#define __MYFILE__ "uisqueue.c"

#define __MYFILE__ "uisqueue.c"





#define RETVOID    do { goto Away; } while (0)

#define RETINT(x)  do { rc = (x); goto Away; } while (0)

#define RETINT(x)  do { rc = (x); goto Away; } while (0)





#define CHECK_CACHE_ALIGN 0

#define CHECK_CACHE_ALIGN 0

drivers/staging/unisys/visorchipset/parser.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -213,7 +213,7 @@ parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string) 
	if (ctx == NULL) {

	if (ctx == NULL) {

		ERRDRV("%s (%s:%d) - no context",

		ERRDRV("%s (%s:%d) - no context",

		       __func__, __FILE__, __LINE__);

		       __func__, __FILE__, __LINE__);

		RETVOID;

		goto Away;

	}

	}

	phdr = (ULTRA_CONTROLVM_PARAMETERS_HEADER *) (ctx->data);

	phdr = (ULTRA_CONTROLVM_PARAMETERS_HEADER *) (ctx->data);

	switch (which_string) {

	switch (which_string) {
@@ -235,10 +235,8 @@ parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string) 
		break;

		break;

	default:

	default:

		ERRDRV("%s - bad which_string %d", __func__, which_string);

		ERRDRV("%s - bad which_string %d", __func__, which_string);

		RETVOID;

		break;

		break;

	}

	}

	RETVOID;





Away:

Away:

	return;

	return;

drivers/staging/unisys/visorchipset/visorchipset_main.c

+5 −7
Original line number Original line Diff line number Diff line
@@ -1927,12 +1927,12 @@ controlvm_periodic_work(struct work_struct *work) 




	/* make sure visorbus server is registered for controlvm callbacks */

	/* make sure visorbus server is registered for controlvm callbacks */

	if (visorchipset_serverregwait && !serverregistered)

	if (visorchipset_serverregwait && !serverregistered)

		RETVOID;

		goto Away;

	/* make sure visorclientbus server is regsitered for controlvm

	/* make sure visorclientbus server is regsitered for controlvm

	 * callbacks

	 * callbacks

	 */

	 */

	if (visorchipset_clientregwait && !clientregistered)

	if (visorchipset_clientregwait && !clientregistered)

		RETVOID;

		goto Away;





	memset(&chanInfo, 0, sizeof(VISORCHIPSET_CHANNEL_INFO));

	memset(&chanInfo, 0, sizeof(VISORCHIPSET_CHANNEL_INFO));

	if (!ControlVm_channel) {

	if (!ControlVm_channel) {
@@ -1963,7 +1963,7 @@ controlvm_periodic_work(struct work_struct *work) 
	if ((ControlVm_channel != NULL) || (Poll_Count >= 250))

	if ((ControlVm_channel != NULL) || (Poll_Count >= 250))

		;	/* keep going */

		;	/* keep going */

	else

	else

		RETVOID;

		goto Away;





	/* Check events to determine if response to CHIPSET_READY

	/* Check events to determine if response to CHIPSET_READY

	 * should be sent

	 * should be sent
@@ -2033,8 +2033,6 @@ controlvm_periodic_work(struct work_struct *work) 
	/* parahotplug_worker */

	/* parahotplug_worker */

	parahotplug_process_list();

	parahotplug_process_list();





	RETVOID;



Away:

Away:





	if (time_after(jiffies,

	if (time_after(jiffies,
@@ -2071,13 +2069,13 @@ setup_crash_devices_work_queue(struct work_struct *work) 




	/* make sure visorbus server is registered for controlvm callbacks */

	/* make sure visorbus server is registered for controlvm callbacks */

	if (visorchipset_serverregwait && !serverregistered)

	if (visorchipset_serverregwait && !serverregistered)

		RETVOID;

		goto Away;





	/* make sure visorclientbus server is regsitered for controlvm

	/* make sure visorclientbus server is regsitered for controlvm

	 * callbacks

	 * callbacks

	 */

	 */

	if (visorchipset_clientregwait && !clientregistered)

	if (visorchipset_clientregwait && !clientregistered)

		RETVOID;

		goto Away;





	POSTCODE_LINUX_2(CRASH_DEV_ENTRY_PC, POSTCODE_SEVERITY_INFO);

	POSTCODE_LINUX_2(CRASH_DEV_ENTRY_PC, POSTCODE_SEVERITY_INFO);