Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36b20824 authored by Luciano Coelho's avatar Luciano Coelho
Browse files

wl12xx: remove deprecated packet detection threshold config 



The ACX_PD_THRESHOLD configuration command is deprecated and should
not be used anymore.

Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent 5de8eef4

drivers/net/wireless/wl12xx/acx.c

+0 −26
Original line number Diff line number Diff line
@@ -186,32 +186,6 @@ int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl) 
	return ret;

}



int wl1271_acx_pd_threshold(struct wl1271 *wl)

{

	struct acx_packet_detection *pd;

	int ret;



	wl1271_debug(DEBUG_ACX, "acx data pd threshold");



	pd = kzalloc(sizeof(*pd), GFP_KERNEL);

	if (!pd) {

		ret = -ENOMEM;

		goto out;

	}



	pd->threshold = cpu_to_le32(wl->conf.rx.packet_detection_threshold);



	ret = wl1271_cmd_configure(wl, ACX_PD_THRESHOLD, pd, sizeof(*pd));

	if (ret < 0) {

		wl1271_warning("failed to set pd threshold: %d", ret);

		goto out;

	}



out:

	kfree(pd);

	return ret;

}



int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif,

		    enum acx_slot_type slot_time)

{

drivers/net/wireless/wl12xx/acx.h

+0 −8
Original line number Diff line number Diff line
@@ -171,13 +171,6 @@ struct acx_rx_msdu_lifetime { 
	__le32 lifetime;

} __packed;



struct acx_packet_detection {

	struct acx_header header;



	__le32 threshold;

} __packed;





enum acx_slot_type {

	SLOT_TIME_LONG = 0,

	SLOT_TIME_SHORT = 1,
@@ -1238,7 +1231,6 @@ int wl1271_acx_feature_cfg(struct wl1271 *wl, struct wl12xx_vif *wlvif); 
int wl1271_acx_mem_map(struct wl1271 *wl,

		       struct acx_header *mem_map, size_t len);

int wl1271_acx_rx_msdu_life_time(struct wl1271 *wl);

int wl1271_acx_pd_threshold(struct wl1271 *wl);

int wl1271_acx_slot(struct wl1271 *wl, struct wl12xx_vif *wlvif,

		    enum acx_slot_type slot_time);

int wl1271_acx_group_address_tbl(struct wl1271 *wl, struct wl12xx_vif *wlvif,

drivers/net/wireless/wl12xx/init.c

+0 −16
Original line number Diff line number Diff line
@@ -223,17 +223,6 @@ static int wl12xx_init_rx_config(struct wl1271 *wl) 
	return 0;

}



int wl1271_init_phy_config(struct wl1271 *wl)

{

	int ret;



	ret = wl1271_acx_pd_threshold(wl);

	if (ret < 0)

		return ret;



	return 0;

}



static int wl12xx_init_phy_vif_config(struct wl1271 *wl,

					    struct wl12xx_vif *wlvif)

{
@@ -706,11 +695,6 @@ int wl1271_hw_init(struct wl1271 *wl) 
	if (ret < 0)

		goto out_free_memmap;



	/* PHY layer config */

	ret = wl1271_init_phy_config(wl);

	if (ret < 0)

		goto out_free_memmap;



	ret = wl1271_acx_dco_itrim_params(wl);

	if (ret < 0)

		goto out_free_memmap;

drivers/net/wireless/wl12xx/init.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 


int wl1271_hw_init_power_auth(struct wl1271 *wl);

int wl1271_init_templates_config(struct wl1271 *wl);

int wl1271_init_phy_config(struct wl1271 *wl);

int wl1271_init_pta(struct wl1271 *wl);

int wl1271_init_energy_detection(struct wl1271 *wl);

int wl1271_chip_specific_init(struct wl1271 *wl);

drivers/net/wireless/wl12xx/main.c

+0 −5
Original line number Diff line number Diff line
@@ -674,11 +674,6 @@ static int wl1271_plt_init(struct wl1271 *wl) 
	if (ret < 0)

		return ret;



	/* PHY layer config */

	ret = wl1271_init_phy_config(wl);

	if (ret < 0)

		goto out_free_memmap;



	ret = wl12xx_acx_mem_cfg(wl);

	if (ret < 0)

		goto out_free_memmap;