From 157edcca3321f058600fd7b23b7151021ad0b209 Mon Sep 17 00:00:00 2001 From: Chaehyun Lim Date: Tue, 16 Feb 2016 17:39:52 +0900 Subject: [PATCH] staging: wilc1000: handle_set_mac_address: change return type to void When handle_set_mac_address is called in hostIFthread that is a kernel thread, it is not checked return type of this function. This patch changes return type to void and removes a brace of if statement due to have a single statement. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 206ce70a6232..98734968e8d3 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -424,15 +424,15 @@ static s32 handle_get_ip_address(struct wilc_vif *vif, u8 idx) return result; } -static s32 handle_set_mac_address(struct wilc_vif *vif, - struct set_mac_addr *set_mac_addr) +static void handle_set_mac_address(struct wilc_vif *vif, + struct set_mac_addr *set_mac_addr) { s32 result = 0; struct wid wid; u8 *mac_buf = kmemdup(set_mac_addr->mac_addr, ETH_ALEN, GFP_KERNEL); if (!mac_buf) - return -ENOMEM; + return; wid.id = (u16)WID_MAC_ADDR; wid.type = WID_STR; @@ -441,13 +441,10 @@ static s32 handle_set_mac_address(struct wilc_vif *vif, result = wilc_send_config_pkt(vif, SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); - if (result) { + if (result) PRINT_ER("Failed to set mac address\n"); - result = -EFAULT; - } kfree(mac_buf); - return result; } static s32 handle_get_mac_address(struct wilc_vif *vif, -- 2.34.1