wl12xx: remove deprecated packet detection threshold config

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

Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c
index bde1d862bdd595cc88f6943d40d44f949c51b8f9..7537c401a4487174a0d50680b1d84e68c3e16675 100644 (file)
--- a/drivers/net/wireless/wl12xx/acx.c
+++ b/drivers/net/wireless/wl12xx/acx.c
@@ -186,32 +186,6 @@ out:
        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)
 {

diff --git a/drivers/net/wireless/wl12xx/acx.h b/drivers/net/wireless/wl12xx/acx.h
index b2d85bea6378a6feaed850faec2c6e506c2a504c..69892b40c2dfc850cd44b434a155c5ce81da4c6c 100644 (file)
--- a/drivers/net/wireless/wl12xx/acx.h
+++ b/drivers/net/wireless/wl12xx/acx.h
@@ -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,

diff --git a/drivers/net/wireless/wl12xx/init.c b/drivers/net/wireless/wl12xx/init.c
index 76625145e32eef4eaa22d80c8312474082ef7282..ca7ee59e4505b297c104197bfde176e34336458b 100644 (file)
--- a/drivers/net/wireless/wl12xx/init.c
+++ b/drivers/net/wireless/wl12xx/init.c
@@ -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;

diff --git a/drivers/net/wireless/wl12xx/init.h b/drivers/net/wireless/wl12xx/init.h
index 81140b81f654757b3b6d00588760ff6bc3ba23ad..2da0f404ef6e44df9c076b7e98b4d1c5ba53132d 100644 (file)
--- a/drivers/net/wireless/wl12xx/init.h
+++ b/drivers/net/wireless/wl12xx/init.h
@@ -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);

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 333bc294f1d9446e77e0237e4131086234c4a41d..ec446710ebb33ce116b15ebcf1be529edacacc9f 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -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;