Title: [9392] trunk/arch/blackfin: coding style refine according to mike's comments
- Revision
- 9392
- Author
- steven.miao
- Date
- 2010-10-25 00:12:34 -0400 (Mon, 25 Oct 2010)
Log Message
coding style refine according to mike's comments
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/bfin_dma_5xx.c (9391 => 9392)
--- trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2010-10-24 21:48:54 UTC (rev 9391)
+++ trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2010-10-25 04:12:34 UTC (rev 9392)
@@ -112,7 +112,7 @@
}
#ifdef CONFIG_BF54x
-#if defined(CH_UART2_RX) && defined(CH_UART2_TX)
+# if defined(CH_UART2_RX) && defined(CH_UART2_TX)
if (channel == CH_UART2_RX) {
unsigned int per_map;
per_map = dma_ch[channel].regs->peripheral_map & 0xFFF;
@@ -127,8 +127,8 @@
dma_ch[channel].regs->peripheral_map = per_map |
(0xD<<12);
}
-#endif
-#if defined(CH_UART3_RX) && defined(CH_UART3_TX)
+# endif
+# if defined(CH_UART3_RX) && defined(CH_UART3_TX)
if (channel == CH_UART3_RX) {
unsigned int per_map;
per_map = dma_ch[channel].regs->peripheral_map & 0xFFF;
@@ -143,8 +143,8 @@
dma_ch[channel].regs->peripheral_map = per_map |
(0xF<<12);
}
+# endif
#endif
-#endif
dma_ch[channel].device_id = device_id;
dma_ch[channel].irq = 0;
Modified: trunk/arch/blackfin/mach-bf548/Kconfig (9391 => 9392)
--- trunk/arch/blackfin/mach-bf548/Kconfig 2010-10-24 21:48:54 UTC (rev 9391)
+++ trunk/arch/blackfin/mach-bf548/Kconfig 2010-10-25 04:12:34 UTC (rev 9392)
@@ -54,7 +54,7 @@
RX -> DMA13
TX -> DMA14
-config UART2_DMA_RX_ON_DMA18
+config UART2_DMA_RX_ON_DMA18
bool "UART2 DMA RX -> DMA18 TX -> DMA19"
help
UART2 DMA channel assignment
@@ -62,7 +62,7 @@
TX -> DMA19
use SPORT2 default DMA channel
-config UART2_DMA_RX_ON_DMA13
+config UART2_DMA_RX_ON_DMA13
bool "UART2 DMA RX -> DMA13 TX -> DMA14"
help
UART2 DMA channel assignment
@@ -83,7 +83,7 @@
RX -> DMA15
TX -> DMA16
-config UART3_DMA_RX_ON_DMA20
+config UART3_DMA_RX_ON_DMA20
bool "UART3 DMA RX -> DMA20 TX -> DMA21"
help
UART3 DMA channel assignment
@@ -91,13 +91,14 @@
TX -> DMA21
use SPORT3 default DMA channel
-config UART3_DMA_RX_ON_DMA15
+config UART3_DMA_RX_ON_DMA15
bool "UART3 DMA RX -> DMA15 TX -> DMA16"
help
UART3 DMA channel assignment
RX -> DMA15
TX -> DMA16
use PIXC default DMA channel
+
endchoice
comment "Interrupt Priority Assignment"
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
