1 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
2 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
4 #include <linux/device.h>
5 #include <linux/leds.h>
6 #include <linux/completion.h>
7 +#include <linux/pm_qos_params.h>
11 @@ -618,6 +619,8 @@ struct ath_softc {
12 struct ath_descdma txsdma;
14 struct ath_ant_comb ant_comb;
16 + struct pm_qos_request_list pm_qos_req;
20 @@ -647,7 +650,6 @@ static inline void ath_read_cachesize(st
23 extern struct ieee80211_ops ath9k_ops;
24 -extern struct pm_qos_request_list ath9k_pm_qos_req;
25 extern int modparam_nohwcrypt;
28 --- a/drivers/net/wireless/ath/ath9k/init.c
29 +++ b/drivers/net/wireless/ath/ath9k/init.c
33 #include <linux/slab.h>
34 -#include <linux/pm_qos_params.h>
35 #include <linux/ath9k_platform.h>
38 @@ -195,8 +194,6 @@ static const struct ath_ops ath9k_common
39 .write = ath9k_iowrite32,
42 -struct pm_qos_request_list ath9k_pm_qos_req;
44 /**************************/
46 /**************************/
47 @@ -786,7 +783,7 @@ int ath9k_init_device(u16 devid, struct
49 ath_start_rfkill_poll(sc);
51 - pm_qos_add_request(&ath9k_pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
52 + pm_qos_add_request(&sc->pm_qos_req, PM_QOS_CPU_DMA_LATENCY,
53 PM_QOS_DEFAULT_VALUE);
56 @@ -857,7 +854,7 @@ void ath9k_deinit_device(struct ath_soft
59 ieee80211_unregister_hw(hw);
60 - pm_qos_remove_request(&ath9k_pm_qos_req);
61 + pm_qos_remove_request(&sc->pm_qos_req);
64 ath9k_deinit_softc(sc);
65 --- a/drivers/net/wireless/ath/ath9k/main.c
66 +++ b/drivers/net/wireless/ath/ath9k/main.c
70 #include <linux/nl80211.h>
71 -#include <linux/pm_qos_params.h>
75 @@ -1184,7 +1183,7 @@ static int ath9k_start(struct ieee80211_
76 ath9k_btcoex_timer_resume(sc);
79 - pm_qos_update_request(&ath9k_pm_qos_req, 55);
80 + pm_qos_update_request(&sc->pm_qos_req, 55);
83 mutex_unlock(&sc->mutex);
84 @@ -1336,7 +1335,7 @@ static void ath9k_stop(struct ieee80211_
86 sc->sc_flags |= SC_OP_INVALID;
88 - pm_qos_update_request(&ath9k_pm_qos_req, PM_QOS_DEFAULT_VALUE);
89 + pm_qos_update_request(&sc->pm_qos_req, PM_QOS_DEFAULT_VALUE);
91 mutex_unlock(&sc->mutex);