From: Benjamin Romer Date: Fri, 3 Oct 2014 18:08:52 +0000 (-0400) Subject: staging: unisys: fix CamelCase names in ReqHandlerAdd() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3636c0da3d048a058c01e5be71cd601fbdbb1c7e;p=openwrt%2Fstaging%2Fblogic.git staging: unisys: fix CamelCase names in ReqHandlerAdd() Fix CamelCase names: ReqHandlerAdd => req_handler_add Server_Channel_Ok => svr_channel_ok channelBytes => channel_bytes Server_Channel_Init => svr_channel_init clientStr => client_str ClientStrLen => client_str_len Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/include/uisutils.h b/drivers/staging/unisys/include/uisutils.h index 992c8cdfb725..1455c73a5479 100644 --- a/drivers/staging/unisys/include/uisutils.h +++ b/drivers/staging/unisys/include/uisutils.h @@ -65,15 +65,15 @@ struct req_handler_info { struct list_head list_link; /* links into ReqHandlerInfo_list */ }; -struct req_handler_info *ReqHandlerAdd(uuid_le switchTypeGuid, +struct req_handler_info *req_handler_add(uuid_le switch_uuid, const char *switch_type_name, int (*controlfunc)(struct io_msgs *), unsigned long min_channel_bytes, - int (*Server_Channel_Ok)(unsigned long - channelBytes), - int (*Server_Channel_Init)(void *x, - unsigned char *clientStr, - u32 clientStrLen, u64 bytes)); + int (*svr_channel_ok)(unsigned long + channel_bytes), + int (*svr_channel_init)(void *x, + unsigned char *client_str, + u32 client_str_len, u64 bytes)); struct req_handler_info *ReqHandlerFind(uuid_le switchTypeGuid); int ReqHandlerDel(uuid_le switchTypeGuid); @@ -119,9 +119,9 @@ int uisctrl_register_req_handler_ex(uuid_le switchTypeGuid, const char *switch_type_name, int (*fptr)(struct io_msgs *), unsigned long min_channel_bytes, - int (*Server_Channel_Ok)(unsigned long + int (*svr_channel_ok)(unsigned long channelBytes), - int (*Server_Channel_Init) + int (*svr_channel_init) (void *x, unsigned char *clientStr, u32 clientStrLen, u64 bytes), ULTRA_VBUS_DEVICEINFO *chipset_DriverInfo); diff --git a/drivers/staging/unisys/uislib/uisutils.c b/drivers/staging/unisys/uislib/uisutils.c index 7006c470d6ac..b336debe1d73 100644 --- a/drivers/staging/unisys/uislib/uisutils.c +++ b/drivers/staging/unisys/uislib/uisutils.c @@ -135,7 +135,7 @@ uisctrl_register_req_handler_ex(uuid_le switchTypeGuid, &switchTypeGuid); goto Away; } - pReqHandlerInfo = ReqHandlerAdd(switchTypeGuid, + pReqHandlerInfo = req_handler_add(switchTypeGuid, switch_type_name, controlfunc, min_channel_bytes, @@ -279,7 +279,7 @@ static LIST_HEAD(ReqHandlerInfo_list); /* list of struct req_handler_info */ static DEFINE_SPINLOCK(ReqHandlerInfo_list_lock); struct req_handler_info * -ReqHandlerAdd(uuid_le switchTypeGuid, +req_handler_add(uuid_le switch_uuid, const char *switch_type_name, int (*controlfunc)(struct io_msgs *), unsigned long min_channel_bytes, @@ -292,7 +292,7 @@ ReqHandlerAdd(uuid_le switchTypeGuid, rc = kzalloc(sizeof(*rc), GFP_ATOMIC); if (!rc) return NULL; - rc->switch_uuid = switchTypeGuid; + rc->switch_uuid = switch_uuid; rc->controlfunc = controlfunc; rc->min_channel_bytes = min_channel_bytes; rc->server_channel_ok = Server_Channel_Ok;