diff options
author | manjugk manjugk <manjugk@ti.com> | 2010-05-14 15:05:25 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:16:39 -0400 |
commit | ea221a6ae73c7696c60a52aefd8a7af0bb47033a (patch) | |
tree | a9ebbbcbeeff9f2f03968a4848ed7ad92b5a2522 | |
parent | ada8d4a5e2ed9de8a5a58788c4b6a4c8103e0f8d (diff) |
omap: DMA: Fix multi-line comments
Multi line comments are fixed as per CodingStyle
guidelines.
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Manjunatha GK <manjugk@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/plat-omap/dma.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index ad42ec3592e5..f7f571e7987e 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -501,7 +501,8 @@ void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode) | |||
501 | burst = 0x2; | 501 | burst = 0x2; |
502 | break; | 502 | break; |
503 | } | 503 | } |
504 | /* not supported by current hardware on OMAP1 | 504 | /* |
505 | * not supported by current hardware on OMAP1 | ||
505 | * w |= (0x03 << 7); | 506 | * w |= (0x03 << 7); |
506 | * fall through | 507 | * fall through |
507 | */ | 508 | */ |
@@ -510,7 +511,8 @@ void omap_set_dma_src_burst_mode(int lch, enum omap_dma_burst_mode burst_mode) | |||
510 | burst = 0x3; | 511 | burst = 0x3; |
511 | break; | 512 | break; |
512 | } | 513 | } |
513 | /* OMAP1 don't support burst 16 | 514 | /* |
515 | * OMAP1 don't support burst 16 | ||
514 | * fall through | 516 | * fall through |
515 | */ | 517 | */ |
516 | default: | 518 | default: |
@@ -604,7 +606,8 @@ void omap_set_dma_dest_burst_mode(int lch, enum omap_dma_burst_mode burst_mode) | |||
604 | burst = 0x3; | 606 | burst = 0x3; |
605 | break; | 607 | break; |
606 | } | 608 | } |
607 | /* OMAP1 don't support burst 16 | 609 | /* |
610 | * OMAP1 don't support burst 16 | ||
608 | * fall through | 611 | * fall through |
609 | */ | 612 | */ |
610 | default: | 613 | default: |
@@ -1285,8 +1288,10 @@ int omap_request_dma_chain(int dev_id, const char *dev_name, | |||
1285 | return -EINVAL; | 1288 | return -EINVAL; |
1286 | } | 1289 | } |
1287 | 1290 | ||
1288 | /* Allocate a queue to maintain the status of the channels | 1291 | /* |
1289 | * in the chain */ | 1292 | * Allocate a queue to maintain the status of the channels |
1293 | * in the chain | ||
1294 | */ | ||
1290 | channels = kmalloc(sizeof(*channels) * no_of_chans, GFP_KERNEL); | 1295 | channels = kmalloc(sizeof(*channels) * no_of_chans, GFP_KERNEL); |
1291 | if (channels == NULL) { | 1296 | if (channels == NULL) { |
1292 | printk(KERN_ERR "omap_dma: No memory for channel queue\n"); | 1297 | printk(KERN_ERR "omap_dma: No memory for channel queue\n"); |
@@ -1915,7 +1920,8 @@ static int omap2_dma_handle_ch(int ch) | |||
1915 | printk(KERN_INFO "DMA transaction error with device %d\n", | 1920 | printk(KERN_INFO "DMA transaction error with device %d\n", |
1916 | dma_chan[ch].dev_id); | 1921 | dma_chan[ch].dev_id); |
1917 | if (cpu_class_is_omap2()) { | 1922 | if (cpu_class_is_omap2()) { |
1918 | /* Errata: sDMA Channel is not disabled | 1923 | /* |
1924 | * Errata: sDMA Channel is not disabled | ||
1919 | * after a transaction error. So we explicitely | 1925 | * after a transaction error. So we explicitely |
1920 | * disable the channel | 1926 | * disable the channel |
1921 | */ | 1927 | */ |