Commit 1032885d authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: fix CamelCase in uisctrl_register_req_handler_ex

Fix CamelCase names:
switchTypeGuid => switch_uuid
clientStr => client_str
clientStrLent => client_str_len
chipset_driverInfo => chipset_driver_info
Server_Channel_Ok => server_channel_ok
Server_Channel_Init => server_channel_init
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f9dd5dda
...@@ -115,16 +115,17 @@ int uisutil_add_proc_line_ex(int *total, char **buffer, int *buffer_remaining, ...@@ -115,16 +115,17 @@ int uisutil_add_proc_line_ex(int *total, char **buffer, int *buffer_remaining,
int uisctrl_register_req_handler(int type, void *fptr, int uisctrl_register_req_handler(int type, void *fptr,
ULTRA_VBUS_DEVICEINFO *chipset_driver_info); ULTRA_VBUS_DEVICEINFO *chipset_driver_info);
int uisctrl_register_req_handler_ex(uuid_le switchTypeGuid, int uisctrl_register_req_handler_ex(uuid_le switch_guid,
const char *switch_type_name, const char *switch_type_name,
int (*fptr)(struct io_msgs *), int (*fptr)(struct io_msgs *),
unsigned long min_channel_bytes, unsigned long min_channel_bytes,
int (*svr_channel_ok)(unsigned long int (*svr_channel_ok)(unsigned long
channelBytes), channel_bytes),
int (*svr_channel_init) int (*svr_channel_init)(void *x,
(void *x, unsigned char *clientStr, unsigned char *client_str,
u32 clientStrLen, u64 bytes), u32 client_str_len,
ULTRA_VBUS_DEVICEINFO *chipset_DriverInfo); u64 bytes),
ULTRA_VBUS_DEVICEINFO *chipset_driver_info);
int uisctrl_unregister_req_handler_ex(uuid_le switchTypeGuid); int uisctrl_unregister_req_handler_ex(uuid_le switchTypeGuid);
unsigned char *util_map_virt(struct phys_info *sg); unsigned char *util_map_virt(struct phys_info *sg);
......
...@@ -105,43 +105,43 @@ uisctrl_register_req_handler(int type, void *fptr, ...@@ -105,43 +105,43 @@ uisctrl_register_req_handler(int type, void *fptr,
EXPORT_SYMBOL_GPL(uisctrl_register_req_handler); EXPORT_SYMBOL_GPL(uisctrl_register_req_handler);
int int
uisctrl_register_req_handler_ex(uuid_le switchTypeGuid, uisctrl_register_req_handler_ex(uuid_le switch_uuid,
const char *switch_type_name, const char *switch_type_name,
int (*controlfunc)(struct io_msgs *), int (*controlfunc)(struct io_msgs *),
unsigned long min_channel_bytes, unsigned long min_channel_bytes,
int (*Server_Channel_Ok)(unsigned long int (*server_channel_ok)(unsigned long
channelBytes), channel_bytes),
int (*Server_Channel_Init) int (*server_channel_init)(void *x,
(void *x, unsigned char *clientStr, unsigned char *client_str,
u32 clientStrLen, u64 bytes), u32 client_str_len, u64 bytes),
ULTRA_VBUS_DEVICEINFO *chipset_DriverInfo) ULTRA_VBUS_DEVICEINFO *chipset_driver_info)
{ {
struct req_handler_info *pReqHandlerInfo; struct req_handler_info *pReqHandlerInfo;
int rc = 0; /* assume failure */ int rc = 0; /* assume failure */
LOGINF("type=%pUL, controlfunc=0x%p.\n", LOGINF("type=%pUL, controlfunc=0x%p.\n",
&switchTypeGuid, controlfunc); &switch_uuid, controlfunc);
if (!controlfunc) { if (!controlfunc) {
LOGERR("%pUL: controlfunc must be supplied\n", &switchTypeGuid); LOGERR("%pUL: controlfunc must be supplied\n", &switch_uuid);
goto Away; goto Away;
} }
if (!Server_Channel_Ok) { if (!server_channel_ok) {
LOGERR("%pUL: Server_Channel_Ok must be supplied\n", LOGERR("%pUL: Server_Channel_Ok must be supplied\n",
&switchTypeGuid); &switch_uuid);
goto Away; goto Away;
} }
if (!Server_Channel_Init) { if (!server_channel_init) {
LOGERR("%pUL: Server_Channel_Init must be supplied\n", LOGERR("%pUL: Server_Channel_Init must be supplied\n",
&switchTypeGuid); &switch_uuid);
goto Away; goto Away;
} }
pReqHandlerInfo = req_handler_add(switchTypeGuid, pReqHandlerInfo = req_handler_add(switch_uuid,
switch_type_name, switch_type_name,
controlfunc, controlfunc,
min_channel_bytes, min_channel_bytes,
Server_Channel_Ok, Server_Channel_Init); server_channel_ok, server_channel_init);
if (!pReqHandlerInfo) { if (!pReqHandlerInfo) {
LOGERR("failed to add %pUL to server list\n", &switchTypeGuid); LOGERR("failed to add %pUL to server list\n", &switch_uuid);
goto Away; goto Away;
} }
...@@ -149,11 +149,11 @@ uisctrl_register_req_handler_ex(uuid_le switchTypeGuid, ...@@ -149,11 +149,11 @@ uisctrl_register_req_handler_ex(uuid_le switchTypeGuid,
rc = 1; /* success */ rc = 1; /* success */
Away: Away:
if (rc) { if (rc) {
if (chipset_DriverInfo) if (chipset_driver_info)
bus_device_info_init(chipset_DriverInfo, "chipset", bus_device_info_init(chipset_driver_info, "chipset",
"uislib", VERSION, NULL); "uislib", VERSION, NULL);
} else } else
LOGERR("failed to register type %pUL.\n", &switchTypeGuid); LOGERR("failed to register type %pUL.\n", &switch_uuid);
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment