staging: wilc1000: Remove return variable from host_interface.c (95313752) · Commits · 戴 / test

drivers/staging/wilc1000/host_interface.c

+6 −14

Original line number	Diff line number	Diff line
		@@ -1358,17 +1358,14 @@ int wilc_add_rx_gtk(struct wilc_vif vif, const u8 rx_gtk, u8 gtk_key_len,
		int wilc_set_pmkid_info(struct wilc_vif vif, struct wilc_pmkid_attr pmkid)
		{
		struct wid wid;
		int result;

		wid.id = WID_PMKID_INFO;
		wid.type = WID_STR;
		wid.size = (pmkid->numpmkid * sizeof(struct wilc_pmkid)) + 1;
		wid.val = (u8 *)pmkid;

		result = wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
		return wilc_send_config_pkt(vif, WILC_SET_CFG, &wid, 1,
		wilc_get_vif_idx(vif));

		return result;
		}

		int wilc_get_mac_address(struct wilc_vif vif, u8 mac_addr)
		@@ -1402,10 +1399,8 @@ int wilc_set_join_req(struct wilc_vif vif, u8 bssid, const u8 *ies,
		if (ies) {
		conn_info->req_ies_len = ies_len;
		conn_info->req_ies = kmemdup(ies, ies_len, GFP_KERNEL);
		if (!conn_info->req_ies) {
		result = -ENOMEM;
		return result;
		}
		if (!conn_info->req_ies)
		return -ENOMEM;
		}

		result = wilc_send_connect_wid(vif);
		@@ -1570,7 +1565,6 @@ int wilc_hif_set_cfg(struct wilc_vif vif, struct cfg_param_attr param)
		{
		struct wid wid_list[4];
		int i = 0;
		int result;

		if (param->flag & WILC_CFG_PARAM_RETRY_SHORT) {
		wid_list[i].id = WID_SHORT_RETRY_LIMIT;
		@@ -1601,10 +1595,8 @@ int wilc_hif_set_cfg(struct wilc_vif vif, struct cfg_param_attr param)
		i++;
		}

		result = wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list,
		return wilc_send_config_pkt(vif, WILC_SET_CFG, wid_list,
		i, wilc_get_vif_idx(vif));

		return result;
		}

		static void get_periodic_rssi(struct timer_list *t)