The include/commontypes.h file defines many types and functions locally when the kernel's existing definitions should have been used instead. This patch series converts UINTN and all of the U16 through U64 and S8 through S64 types to kernel types, and gets rid of the MEMCMP, MEMSET, STRLEN, STRCPY, and MEMCMP_IO macros. It also removes redunantly-defined macros meant for out-of-kernel use, that have no purpose being in the kernel. The U8 type was removed by a previous patch. This new set has been rebased and all conflicts removed. Benjamin Romer (12): staging: unisys: remove U16 type staging: unisys: remove U32 type staging: unisys: remove U64 type staging: unisys: remove S8 type staging: unisys: remove S16 type staging: unisys: remove S32 type staging: unisys: remove S64 type staging: unisys: remove non-kernel code from commontypes.h staging: unisys: remove unused defines from commontypes.h staging: unisys: remove UINTN type staging: unisys: remove MEMSET define staging: unisys: remove MEMCMP_IO drivers/staging/unisys/channels/channel.c | 8 +- drivers/staging/unisys/channels/chanstub.c | 4 +- drivers/staging/unisys/channels/chanstub.h | 4 +- .../unisys/common-spar/include/channels/channel.h | 104 +++++----- .../include/channels/controlframework.h | 22 +- .../include/channels/controlvmchannel.h | 226 ++++++++++----------- .../common-spar/include/channels/diagchannel.h | 30 +-- .../common-spar/include/channels/iochannel.h | 94 ++++----- .../common-spar/include/channels/vbuschannel.h | 12 +- .../unisys/common-spar/include/vmcallinterface.h | 18 +- drivers/staging/unisys/include/commontypes.h | 84 +------- drivers/staging/unisys/include/guestlinuxdebug.h | 14 +- drivers/staging/unisys/include/uisqueue.h | 84 ++++---- drivers/staging/unisys/include/uisutils.h | 86 ++++---- drivers/staging/unisys/uislib/uislib.c | 62 +++--- drivers/staging/unisys/uislib/uisqueue.c | 4 +- drivers/staging/unisys/uislib/uisutils.c | 4 +- drivers/staging/unisys/virthba/virthba.c | 28 +-- drivers/staging/unisys/virtpci/virtpci.h | 4 +- drivers/staging/unisys/visorchannel/visorchannel.h | 14 +- .../unisys/visorchannel/visorchannel_funcs.c | 30 +-- drivers/staging/unisys/visorchipset/file.c | 4 +- drivers/staging/unisys/visorchipset/parser.c | 6 +- drivers/staging/unisys/visorchipset/parser.h | 4 +- drivers/staging/unisys/visorchipset/visorchipset.h | 66 +++--- .../unisys/visorchipset/visorchipset_main.c | 50 ++--- 26 files changed, 492 insertions(+), 574 deletions(-) -- 1.9.1 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel