- fw.wlan.cab_queue[j].head = fw.wlan.cab_queue[j].terminator = &dma_mem.terminator[i++];
-#else
- fw.wlan.cab_queue[0].head = fw.wlan.cab_queue[0].terminator = &dma_mem.terminator[i++];
- fw.wlan.cab_queue[1].head = fw.wlan.cab_queue[1].terminator = &dma_mem.terminator[i++];
-#endif
-#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
-
- BUILD_BUG_ON(AR9170_TERMINATOR_NUMBER != j);
+ init_queue(&fw.wlan.cab_queue[j], &dma_mem.terminator[i++]);
+
+ BUG_ON(AR9170_TERMINATOR_NUMBER != i);