From: Chaehyun Lim Date: Mon, 5 Oct 2015 10:35:01 +0000 (+0900) Subject: staging: wilc1000: remove pstrWFIDrv in host_int_remove_key X-Git-Tag: firefly_0821_release~176^2~802^2~1078 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=754d8c9016e00fc34dc6460ec00db2544033a12b;p=firefly-linux-kernel-4.4.55.git staging: wilc1000: remove pstrWFIDrv in host_int_remove_key This patch remove pstrWFIDrv in host_int_remove_key. There is no need to make another variable to check if first argument is NULL or not. It is able to use wfi_drv directly that is first argument of this function. 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 7acd744efed6..1e465522d4e8 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -4191,11 +4191,10 @@ s32 host_int_remove_key(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8StaAddress) int host_int_remove_wep_key(tstrWILC_WFIDrv *wfi_drv, u8 index) { int result = 0; - tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)wfi_drv; struct host_if_msg msg; - if (pstrWFIDrv == NULL) { + if (wfi_drv == NULL) { result = -EFAULT; PRINT_ER("Failed to send setup multicast config packet\n"); return result; @@ -4219,7 +4218,7 @@ int host_int_remove_wep_key(tstrWILC_WFIDrv *wfi_drv, u8 index) result = wilc_mq_send(&gMsgQHostIF, &msg, sizeof(struct host_if_msg)); if (result) PRINT_ER("Error in sending message queue : Request to remove WEP key\n"); - down(&(pstrWFIDrv->hSemTestKeyBlock)); + down(&(wfi_drv->hSemTestKeyBlock)); return result; }