aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2009-05-28 16:23:52 -0400
committerTony Lindgren <tony@atomide.com>2009-05-28 16:23:52 -0400
commit279b918d726a66c61c9dc7aec8b1fb035d40fdfc (patch)
treeaba2bc450ed52d6a7e1e172601da87f51e3712ae /arch/arm/plat-omap
parent0815f8eaae6d11b9dae6c2ff0202d7945f8d7cd2 (diff)
ARM: OMAP2/3: sDMA: Correct omap_request_dma_chain(), v2
Original OMAP DMA chaining design had chain_id as one of the callback parameters. Patch 538528de0cb256f65716ab2e9613d9e920f97fe2 changed it to use logical channel instead. Correct the naming for callback to also use logical channel number instead of the chain_id. More details are on this email thread: http://marc.info/?l=linux-omap&m=122961071931459&w=2 Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r--arch/arm/plat-omap/dma.c2
-rw-r--r--arch/arm/plat-omap/include/mach/dma.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 58d98ad981e4..06e9cbe8b8eb 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -1220,7 +1220,7 @@ static void create_dma_lch_chain(int lch_head, int lch_queue)
1220 * Failure: -EINVAL/-ENOMEM 1220 * Failure: -EINVAL/-ENOMEM
1221 */ 1221 */
1222int omap_request_dma_chain(int dev_id, const char *dev_name, 1222int omap_request_dma_chain(int dev_id, const char *dev_name,
1223 void (*callback) (int chain_id, u16 ch_status, 1223 void (*callback) (int lch, u16 ch_status,
1224 void *data), 1224 void *data),
1225 int *chain_id, int no_of_chans, int chain_mode, 1225 int *chain_id, int no_of_chans, int chain_mode,
1226 struct omap_dma_channel_params params) 1226 struct omap_dma_channel_params params)
diff --git a/arch/arm/plat-omap/include/mach/dma.h b/arch/arm/plat-omap/include/mach/dma.h
index 35fefdb0b79a..19df76f97ab3 100644
--- a/arch/arm/plat-omap/include/mach/dma.h
+++ b/arch/arm/plat-omap/include/mach/dma.h
@@ -532,7 +532,7 @@ extern int omap_get_dma_index(int lch, int *ei, int *fi);
532/* Chaining APIs */ 532/* Chaining APIs */
533#ifndef CONFIG_ARCH_OMAP1 533#ifndef CONFIG_ARCH_OMAP1
534extern int omap_request_dma_chain(int dev_id, const char *dev_name, 534extern int omap_request_dma_chain(int dev_id, const char *dev_name,
535 void (*callback) (int chain_id, u16 ch_status, 535 void (*callback) (int lch, u16 ch_status,
536 void *data), 536 void *data),
537 int *chain_id, int no_of_chans, 537 int *chain_id, int no_of_chans,
538 int chain_mode, 538 int chain_mode,