From: Benjamin Romer Date: Thu, 23 Oct 2014 18:30:54 +0000 (-0400) Subject: staging: unisys: fix parameters to macro SPAR_VNIC_CHANNEL_OK_CLIENT X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bdedd94ad5b0931ef0bd56f8d9a2892d86f2049e;p=openwrt%2Fstaging%2Fblogic.git staging: unisys: fix parameters to macro SPAR_VNIC_CHANNEL_OK_CLIENT Remove the unused logCtx parameter and fix the CamelCase name: pChannel => ch Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h b/drivers/staging/unisys/common-spar/include/channels/iochannel.h index 51373a182e0d..1fb7174fc597 100644 --- a/drivers/staging/unisys/common-spar/include/channels/iochannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/iochannel.h @@ -65,8 +65,8 @@ ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID, \ ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE)) -#define SPAR_VNIC_CHANNEL_OK_CLIENT(pChannel, logCtx) \ - (spar_check_channel_client(pChannel, spar_vnic_channel_protocol_uuid, \ +#define SPAR_VNIC_CHANNEL_OK_CLIENT(ch) \ + (spar_check_channel_client(ch, spar_vnic_channel_protocol_uuid, \ "vnic", MIN_IO_CHANNEL_SIZE, \ ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID, \ ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE)) diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c index 72c8479fe49c..14948a082934 100644 --- a/drivers/staging/unisys/uislib/uislib.c +++ b/drivers/staging/unisys/uislib/uislib.c @@ -476,7 +476,7 @@ create_device(struct controlvm_message *msg, char *buf) chanptr))-> chtype); if (!SPAR_VNIC_CHANNEL_OK_CLIENT - (dev->chanptr, NULL)) { + (dev->chanptr)) { LOGERR("CONTROLVM_DEVICE_CREATE Failed: VNIC[CLIENT] dev %d chan invalid.", devNo); POSTCODE_LINUX_4