Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ac91f910455f0ff323d965123b76d112afb49dd6

Authored by Johannes Berg
Committed by John W. Linville
1 parent cc5f7e3976
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

iwlwifi: move notification wait into core 

This code is a library to be used by multiple
opmodes, so move it into the iwlwifi module.

Reviewed-by: Donald H Fry <donald.h.fry@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 2 changed files with 8 additions and 2 deletions Side-by-side Diff

drivers/net/wireless/iwlwifi/Makefile
Diff comments   View file @ ac91f91
... ... @@ -7,7 +7,6 @@
7 7 iwldvm-objs += iwl-eeprom.o iwl-power.o
8 8 iwldvm-objs += iwl-scan.o iwl-led.o
9 9 iwldvm-objs += iwl-agn-rxon.o iwl-agn-devices.o
10   -iwldvm-objs += iwl-notif-wait.o
11 10  
12 11 iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
13 12 iwldvm-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-testmode.o
... ... @@ -24,6 +23,7 @@
24 23 iwlwifi-objs += iwl-pci.o
25 24 iwlwifi-objs += iwl-drv.o
26 25 iwlwifi-objs += iwl-debug.o
  26 +iwlwifi-objs += iwl-notif-wait.o
27 27 iwlwifi-objs += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o
28 28  
29 29 iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
drivers/net/wireless/iwlwifi/iwl-notif-wait.c
Diff comments   View file @ ac91f91
... ... @@ -61,6 +61,7 @@
61 61 *
62 62 *****************************************************************************/
63 63 #include <linux/sched.h>
  64 +#include <linux/export.h>
64 65  
65 66 #include "iwl-notif-wait.h"
66 67  
... ... @@ -71,6 +72,7 @@
71 72 INIT_LIST_HEAD(&notif_wait->notif_waits);
72 73 init_waitqueue_head(&notif_wait->notif_waitq);
73 74 }
  75 +EXPORT_SYMBOL_GPL(iwl_notification_wait_init);
74 76  
75 77 void iwl_notification_wait_notify(struct iwl_notif_wait_data *notif_wait,
76 78 struct iwl_rx_packet *pkt)
... ... @@ -115,6 +117,7 @@
115 117 if (triggered)
116 118 wake_up_all(&notif_wait->notif_waitq);
117 119 }
  120 +EXPORT_SYMBOL_GPL(iwl_notification_wait_notify);
118 121  
119 122 void iwl_abort_notification_waits(struct iwl_notif_wait_data *notif_wait)
120 123 {
121 124  
... ... @@ -128,8 +131,8 @@
128 131  
129 132 wake_up_all(&notif_wait->notif_waitq);
130 133 }
  134 +EXPORT_SYMBOL_GPL(iwl_abort_notification_waits);
131 135  
132   -
133 136 void
134 137 iwl_init_notification_wait(struct iwl_notif_wait_data *notif_wait,
135 138 struct iwl_notification_wait *wait_entry,
... ... @@ -152,6 +155,7 @@
152 155 list_add(&wait_entry->list, &notif_wait->notif_waits);
153 156 spin_unlock_bh(&notif_wait->notif_wait_lock);
154 157 }
  158 +EXPORT_SYMBOL_GPL(iwl_init_notification_wait);
155 159  
156 160 int iwl_wait_notification(struct iwl_notif_wait_data *notif_wait,
157 161 struct iwl_notification_wait *wait_entry,
... ... @@ -175,6 +179,7 @@
175 179 return -ETIMEDOUT;
176 180 return 0;
177 181 }
  182 +EXPORT_SYMBOL_GPL(iwl_wait_notification);
178 183  
179 184 void iwl_remove_notification(struct iwl_notif_wait_data *notif_wait,
180 185 struct iwl_notification_wait *wait_entry)
... ... @@ -183,4 +188,5 @@
183 188 list_del(&wait_entry->list);
184 189 spin_unlock_bh(&notif_wait->notif_wait_lock);
185 190 }
  191 +EXPORT_SYMBOL_GPL(iwl_remove_notification);