diff options
| author | Ajay Singh | 2018-12-02 19:02:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-12-05 09:48:45 +0100 |
| commit | 6133ed9f639607b9d95901ddc91dcf4f097066db (patch) | |
| tree | 684c9d54eee94f8cf59098eda5dde78969afcb42 /drivers/staging/wilc1000 | |
| parent | staging: wilc1000: handle add and edit station from the cfg80211 context (diff) | |
| download | kernel-qcow2-linux-6133ed9f639607b9d95901ddc91dcf4f097066db.tar.gz kernel-qcow2-linux-6133ed9f639607b9d95901ddc91dcf4f097066db.tar.xz kernel-qcow2-linux-6133ed9f639607b9d95901ddc91dcf4f097066db.zip | |
staging: wilc1000: use void return for wilc_hif_pack_sta_param()
Change the return type from u32 to void for wilc_hif_pack_sta_param() as
its value is not used. Also remove the use of extra pointer as it's not
required now.
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/host_interface.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index fedcff8fa4b7..40477cabce5a 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -1960,12 +1960,9 @@ static void handle_del_beacon(struct work_struct *work) kfree(msg); } -static u32 wilc_hif_pack_sta_param(u8 *buff, const u8 *mac, - struct station_parameters *params) +static void wilc_hif_pack_sta_param(u8 *cur_byte, const u8 *mac, + struct station_parameters *params) { - u8 *cur_byte; - - cur_byte = buff; ether_addr_copy(cur_byte, mac); cur_byte += ETH_ALEN; @@ -1990,9 +1987,6 @@ static u32 wilc_hif_pack_sta_param(u8 *buff, const u8 *mac, put_unaligned_le16(params->sta_flags_mask, cur_byte); cur_byte += 2; put_unaligned_le16(params->sta_flags_set, cur_byte); - cur_byte += 2; - - return cur_byte - buff; } static void handle_del_all_sta(struct work_struct *work) @@ -3440,7 +3434,7 @@ int wilc_add_station(struct wilc_vif *vif, const u8 *mac, return -ENOMEM; cur_byte = wid.val; - cur_byte += wilc_hif_pack_sta_param(cur_byte, mac, params); + wilc_hif_pack_sta_param(cur_byte, mac, params); result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); @@ -3532,7 +3526,7 @@ int wilc_edit_station(struct wilc_vif *vif, const u8 *mac, return -ENOMEM; cur_byte = wid.val; - cur_byte += wilc_hif_pack_sta_param(cur_byte, mac, params); + wilc_hif_pack_sta_param(cur_byte, mac, params); result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1, wilc_get_vif_idx(vif)); |