staging: wilc1000: remove argument hif_drv in host_int_get_ipaddress
authorChaehyun Lim <chaehyun.lim@gmail.com>
Wed, 30 Dec 2015 12:15:42 +0000 (21:15 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Feb 2016 23:09:44 +0000 (15:09 -0800)
This patch removes hif_drv argument of host_int_get_ipaddress.
There is no need to pass hif_drv in this function because hif_drv is a
member of vif. It is removed struct host_if_drv and use hif_drv of vif.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c

index a203647..72115ae 100644 (file)
@@ -362,16 +362,13 @@ static s32 handle_set_operation_mode(struct wilc_vif *vif,
        return result;
 }
 
-static int host_int_get_ipaddress(struct wilc_vif *vif,
-                                 struct host_if_drv *hif_drv,
-                                 u8 *u16ipadd, u8 idx);
+static int host_int_get_ipaddress(struct wilc_vif *vif, u8 *u16ipadd, u8 idx);
 
 static s32 handle_set_ip_address(struct wilc_vif *vif, u8 *ip_addr, u8 idx)
 {
        s32 result = 0;
        struct wid wid;
        char firmware_ip_addr[4] = {0};
-       struct host_if_drv *hif_drv = vif->hif_drv;
 
        if (ip_addr[0] < 192)
                ip_addr[0] = 0;
@@ -389,7 +386,7 @@ static s32 handle_set_ip_address(struct wilc_vif *vif, u8 *ip_addr, u8 idx)
        result = wilc_send_config_pkt(vif->wilc, SET_CFG, &wid, 1,
                                 wilc_get_vif_idx(vif));
 
-       host_int_get_ipaddress(vif, hif_drv, firmware_ip_addr, idx);
+       host_int_get_ipaddress(vif, firmware_ip_addr, idx);
 
        if (result) {
                PRINT_ER("Failed to set IP address\n");
@@ -4664,12 +4661,11 @@ int wilc_setup_ipaddress(struct wilc_vif *vif, u8 *ip_addr, u8 idx)
        return result;
 }
 
-static int host_int_get_ipaddress(struct wilc_vif *vif,
-                                 struct host_if_drv *hif_drv,
-                                 u8 *u16ipadd, u8 idx)
+static int host_int_get_ipaddress(struct wilc_vif *vif, u8 *u16ipadd, u8 idx)
 {
        int result = 0;
        struct host_if_msg msg;
+       struct host_if_drv *hif_drv = vif->hif_drv;
 
        if (!hif_drv) {
                PRINT_ER("driver is null\n");