staging: unisys: fix parameters for SPAR_VBUS_CHANNEL_OK_CLIENT macro

Remove the unused logCtx parameter and fix the CamelCase name:

pChannel => ch

Update calls to the macro to remove the unused second parameter.

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/vbuschannel.h b/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
index aa2b34b..c1a73df 100644 (file)
--- a/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
@@ -43,13 +43,13 @@ static const uuid_le spar_vbus_channel_protocol_uuid =
 * increment this. */
 #define SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID 1
 
-#define SPAR_VBUS_CHANNEL_OK_CLIENT(pChannel, logCtx)       \
-       (spar_check_channel_client(pChannel,                            \
-                                  spar_vbus_channel_protocol_uuid,     \
-                                  "vbus",                              \
-                                  sizeof(struct ultra_vbus_channel_protocol),\
-                                  SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID, \
-                                  SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE)) \
+#define SPAR_VBUS_CHANNEL_OK_CLIENT(ch)       \
+       spar_check_channel_client(ch,                           \
+                                 spar_vbus_channel_protocol_uuid,      \
+                                 "vbus",                               \
+                                 sizeof(struct ultra_vbus_channel_protocol),\
+                                 SPAR_VBUS_CHANNEL_PROTOCOL_VERSIONID, \
+                                 SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE)
 
 #define ULTRA_VBUS_CHANNEL_OK_SERVER(actualBytes)    \
        (spar_check_channel_server(spar_vbus_channel_protocol_uuid,     \

diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c
index 6e08734..354b682 100644 (file)
--- a/drivers/staging/unisys/uislib/uislib.c
+++ b/drivers/staging/unisys/uislib/uislib.c
@@ -142,7 +142,7 @@ init_vbus_channel(u64 channelAddr, u32 channelBytes)
                rc = NULL;
                goto Away;
        }
-       if (!SPAR_VBUS_CHANNEL_OK_CLIENT(pChan, NULL)) {
+       if (!SPAR_VBUS_CHANNEL_OK_CLIENT(pChan)) {
                ERRDRV("%s channel cannot be used", __func__);
                uislib_iounmap(pChan);
                rc = NULL;