UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: omap: remove almost-const variables 

dma_stride and dma_common_ch_start are only ever initialised to one
known value at initialisation, and are private to each of these files.
There's no point these being variables at all.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2013-11-08 14:53:35 +00:00
parent e38b1485fd
commit ad0c381a8b
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/mach-omap1/dma.c
View File

@ -36,8 +36,6 @@
static u32 errata;
static u32 enable_1510_mode;
static u8 dma_stride;
static enum omap_reg_offsets dma_common_ch_start, dma_common_ch_end;
static u16 reg_map[] = {
[GCR] = 0x400,
@ -184,7 +182,7 @@ static inline void dma_write(u32 val, int reg, int lch)
u8 stride;
u32 offset;
stride = (reg >= dma_common_ch_start) ? dma_stride : 0;
stride = (reg >= CPC) ? OMAP1_DMA_STRIDE : 0;
offset = reg_map[reg] + (stride * lch);
__raw_writew(val, dma_base + offset);
@ -200,7 +198,7 @@ static inline u32 dma_read(int reg, int lch)
u8 stride;
u32 offset, val;
stride = (reg >= dma_common_ch_start) ? dma_stride : 0;
stride = (reg >= CPC) ? OMAP1_DMA_STRIDE : 0;
offset = reg_map[reg] + (stride * lch);
val = __raw_readw(dma_base + offset);
@ -216,9 +214,9 @@ static inline u32 dma_read(int reg, int lch)
static void omap1_clear_lch_regs(int lch)
{
int i = dma_common_ch_start;
int i;
for (; i <= dma_common_ch_end; i += 1)
for (i = CPC; i <= COLOR; i += 1)
dma_write(0, i, lch);
}
@ -380,10 +378,6 @@ static int __init omap1_system_dma_init(void)
goto exit_release_chan;
}
dma_stride = OMAP1_DMA_STRIDE;
dma_common_ch_start = CPC;
dma_common_ch_end = COLOR;
dma_pdev = platform_device_register_full(&omap_dma_dev_info);
if (IS_ERR(dma_pdev)) {
ret = PTR_ERR(dma_pdev);

14
arch/arm/mach-omap2/dma.c
View File

@ -38,11 +38,10 @@
#define OMAP2_DMA_STRIDE 0x60
static u32 errata;
static u8 dma_stride;
static struct omap_dma_dev_attr *d;
static enum omap_reg_offsets dma_common_ch_start, dma_common_ch_end;
static enum omap_reg_offsets dma_common_ch_end;
static u16 reg_map[] = {
[REVISION] = 0x00,
@ -96,7 +95,7 @@ static inline void dma_write(u32 val, int reg, int lch)
u8 stride;
u32 offset;
stride = (reg >= dma_common_ch_start) ? dma_stride : 0;
stride = (reg >= CSDP) ? OMAP2_DMA_STRIDE : 0;
offset = reg_map[reg] + (stride * lch);
__raw_writel(val, dma_base + offset);
}
@ -106,7 +105,7 @@ static inline u32 dma_read(int reg, int lch)
u8 stride;
u32 offset, val;
stride = (reg >= dma_common_ch_start) ? dma_stride : 0;
stride = (reg >= CSDP) ? OMAP2_DMA_STRIDE : 0;
offset = reg_map[reg] + (stride * lch);
val = __raw_readl(dma_base + offset);
return val;
@ -114,9 +113,9 @@ static inline u32 dma_read(int reg, int lch)
static void omap2_clear_dma(int lch)
{
int i = dma_common_ch_start;
int i;
for (; i <= dma_common_ch_end; i += 1)
for (i = CSDP; i <= dma_common_ch_end; i += 1)
dma_write(0, i, lch);
}
@ -219,9 +218,6 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused)
struct resource *mem;
char *name = "omap_dma_system";
dma_stride = OMAP2_DMA_STRIDE;
dma_common_ch_start = CSDP;
p = kzalloc(sizeof(struct omap_system_dma_plat_info), GFP_KERNEL);
if (!p) {
pr_err("%s: Unable to allocate pdata for %s:%s\n",