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 <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
index 51373a182e0d9415f136a9cc320969ebbebd9be3..1fb7174fc597cdfc00c7ddc0e03ceb927a5e565e 100644 (file)
--- 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 72c8479fe49cab2590ff2d8777f71c3fd901a76f..14948a082934891e6f67dcbb96d477668da10353 100644 (file)
--- 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