diff --git a/drivers/staging/unisys/common-spar/include/iovmcall_gnuc.h b/drivers/staging/unisys/visorbus/iovmcall_gnuc.h
similarity index 100%
rename from drivers/staging/unisys/common-spar/include/iovmcall_gnuc.h
rename to drivers/staging/unisys/visorbus/iovmcall_gnuc.h
diff --git a/drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h b/drivers/staging/unisys/visorbus/vbusdeviceinfo.h
similarity index 100%
rename from drivers/staging/unisys/common-spar/include/vbusdeviceinfo.h
rename to drivers/staging/unisys/visorbus/vbusdeviceinfo.h
diff --git a/drivers/staging/unisys/common-spar/include/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h
similarity index 99%
rename from drivers/staging/unisys/common-spar/include/vmcallinterface.h
rename to drivers/staging/unisys/visorbus/vmcallinterface.h
index 59a7459eb96243708d21cadc99bcff4eba51802b..dc09caf7d07524cf6fb81bb81c9de718b171ae50 100644
--- a/drivers/staging/unisys/common-spar/include/vmcallinterface.h
+++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -85,10 +85,8 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples  */
     /* The following uses VMCALL_POST_CODE_LOGEVENT interface but is currently
      * not used much */
 #define ISSUE_IO_VMCALL_POSTCODE_SEVERITY(postcode, severity)		\
-do {									\
 	ISSUE_IO_EXTENDED_VMCALL(VMCALL_POST_CODE_LOGEVENT, severity,	\
-				 MDS_APPOS, postcode);			\
-} while (0)
+				 MDS_APPOS, postcode)
 #endif
 
 /* Structures for IO VMCALLs */