carl9170 firmware: remove gcc workaround
authorChristian Lamparter <chunkeey@googlemail.com>
Fri, 23 Dec 2011 00:12:53 +0000 (01:12 +0100)
committerChristian Lamparter <chunkeey@googlemail.com>
Fri, 23 Dec 2011 00:12:53 +0000 (01:12 +0100)
this workaround is no longer necessary, gcc
now compiles the code without any spurious
complains.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
carlfw/src/dma.c

index c33608cc4814e251fa7a1bcf3b22a14fb0df6dd6..7c077af511b9ea94a3857650d1cf7bd04dae9953 100644 (file)
@@ -84,14 +84,8 @@ void dma_init_descriptors(void)
        fw.wlan.fw_desc = &dma_mem.terminator[i++];
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
-       /* GCC bug ? */
-# if (CARL9170_INTF_NUM != 2)
        for (j = 0; j < CARL9170_INTF_NUM; j++)
                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);