From: Chaehyun Lim Date: Tue, 22 Sep 2015 09:34:59 +0000 (+0900) Subject: staging: wilc1000: host_int_init: replace s32Error with result X-Git-Tag: firefly_0821_release~176^2~802^2~1806 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5b09bd32a723f41fba91be8c83e0c9909646464e;p=firefly-linux-kernel-4.4.55.git staging: wilc1000: host_int_init: replace s32Error with result This patch replaces s32Error with result in host_int_init function to avoid camelcase. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index c22d57aeb21e..80e6eba16711 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -6360,7 +6360,7 @@ static u32 clients_count; s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) { - s32 s32Error = 0; + s32 result = 0; tstrWILC_WFIDrv *pstrWFIDrv; int err; @@ -6373,13 +6373,13 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) /*Allocate host interface private structure*/ pstrWFIDrv = kzalloc(sizeof(tstrWILC_WFIDrv), GFP_KERNEL); if (!pstrWFIDrv) { - s32Error = -ENOMEM; + result = -ENOMEM; goto _fail_timer_2; } *phWFIDrv = pstrWFIDrv; err = add_handler_in_list(pstrWFIDrv); if (err) { - s32Error = -EFAULT; + result = -EFAULT; goto _fail_timer_2; } @@ -6405,16 +6405,16 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) PRINT_D(HOSTINF_DBG, "INIT: CLIENT COUNT %d\n", clients_count); if (clients_count == 0) { - s32Error = wilc_mq_create(&gMsgQHostIF); + result = wilc_mq_create(&gMsgQHostIF); - if (s32Error < 0) { + if (result < 0) { PRINT_ER("Failed to creat MQ\n"); goto _fail_; } HostIFthreadHandler = kthread_run(hostIFthread, NULL, "WILC_kthread"); if (IS_ERR(HostIFthreadHandler)) { PRINT_ER("Failed to creat Thread\n"); - s32Error = -EFAULT; + result = -EFAULT; goto _fail_mq_; } setup_timer(&g_hPeriodicRSSI, GetPeriodicRSSI, @@ -6454,7 +6454,7 @@ s32 host_int_init(tstrWILC_WFIDrv **phWFIDrv) clients_count++; /* increase number of created entities */ - return s32Error; + return result; _fail_timer_2: up(&(pstrWFIDrv->gtOsCfgValuesSem)); @@ -6464,7 +6464,7 @@ _fail_timer_2: _fail_mq_: wilc_mq_destroy(&gMsgQHostIF); _fail_: - return s32Error; + return result; } /**