Skip to content

Commit

Permalink
ARM: OMAP: DMA: use constant array maximum, drop some LCD DMA code
Browse files Browse the repository at this point in the history
gcc can apparently handle stack-allocated arrays that use a dynamic
variable as the array maximum.  Rather than using a mutable quantity,
simply use a constant maximum possible size.  To me, code clarity is
improved; and it also avoids the following sparse warnings:

arch/arm/plat-omap/dma.c:886:40: error: bad constant expression
arch/arm/plat-omap/dma.c:892:17: error: cannot size expression
arch/arm/plat-omap/dma.c:970:40: error: bad constant expression
arch/arm/plat-omap/dma.c:972:17: error: cannot size expression

Also drop some dead code from the OMAP1 LCD DMA code:

arch/arm/mach-omap1/lcd_dma.c:80:6: warning: symbol 'omap_set_lcd_dma_src_port' was not declared. Should it be static?

Signed-off-by: Paul Walmsley <paul@pwsan.com>
  • Loading branch information
Paul Walmsley committed Apr 13, 2012
1 parent 7cc0442 commit bc4d8b5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
5 changes: 0 additions & 5 deletions arch/arm/mach-omap1/lcd_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,6 @@ void omap_set_lcd_dma_b1(unsigned long addr, u16 fb_xres, u16 fb_yres,
}
EXPORT_SYMBOL(omap_set_lcd_dma_b1);

void omap_set_lcd_dma_src_port(int port)
{
lcd_dma.src_port = port;
}

void omap_set_lcd_dma_ext_controller(int external)
{
lcd_dma.ext_ctrl = external;
Expand Down
13 changes: 11 additions & 2 deletions arch/arm/plat-omap/dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@

#include <plat/tc.h>

/*
* MAX_LOGICAL_DMA_CH_COUNT: the maximum number of logical DMA
* channels that an instance of the SDMA IP block can support. Used
* to size arrays. (The actual maximum on a particular SoC may be less
* than this -- for example, OMAP1 SDMA instances only support 17 logical
* DMA channels.)
*/
#define MAX_LOGICAL_DMA_CH_COUNT 32

#undef DEBUG

#ifndef CONFIG_ARCH_OMAP1
Expand Down Expand Up @@ -883,7 +892,7 @@ void omap_start_dma(int lch)

if (!omap_dma_in_1510_mode() && dma_chan[lch].next_lch != -1) {
int next_lch, cur_lch;
char dma_chan_link_map[dma_lch_count];
char dma_chan_link_map[MAX_LOGICAL_DMA_CH_COUNT];

dma_chan_link_map[lch] = 1;
/* Set the link register of the first channel */
Expand Down Expand Up @@ -967,7 +976,7 @@ void omap_stop_dma(int lch)

if (!omap_dma_in_1510_mode() && dma_chan[lch].next_lch != -1) {
int next_lch, cur_lch = lch;
char dma_chan_link_map[dma_lch_count];
char dma_chan_link_map[MAX_LOGICAL_DMA_CH_COUNT];

memset(dma_chan_link_map, 0, sizeof(dma_chan_link_map));
do {
Expand Down

0 comments on commit bc4d8b5

Please sign in to comment.