kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: OMAP: Don't store timers physical address

Browse source 
The OMAP2+ system timer code stores the physical address of the timer
but never uses it. Remove this and clean-up the code by removing the
local variable "size" and changing the names of the local variables
mem_rsrc and irq_rsrc to mem and irq, respectively.

Signed-off-by: Jon Hunter <jon-hunter@ti.com>
This commit is contained in:
Jon Hunter 2012-09-28 18:03:29 -05:00
parent b0cadb3c86
commit 61b001c564
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
arch/arm/mach-omap2/timer.c
View file

@ -245,8 +245,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
const char *oh_name; const char *oh_name;
struct device_node *np; struct device_node *np;
struct omap_hwmod *oh; struct omap_hwmod *oh;
struct resource irq_rsrc, mem_rsrc; struct resource irq, mem;
size_t size;
int res = 0; int res = 0;
int r; int r;
@ -280,20 +279,18 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
if (!of_have_populated_dt()) { if (!of_have_populated_dt()) {
r = omap_hwmod_get_resource_byname(oh, IORESOURCE_IRQ, NULL, r = omap_hwmod_get_resource_byname(oh, IORESOURCE_IRQ, NULL,
&irq_rsrc); &irq);
if (r) if (r)
return -ENXIO; return -ENXIO;
timer->irq = irq_rsrc.start; timer->irq = irq.start;
r = omap_hwmod_get_resource_byname(oh, IORESOURCE_MEM, NULL, r = omap_hwmod_get_resource_byname(oh, IORESOURCE_MEM, NULL,
&mem_rsrc); &mem);
if (r) if (r)
return -ENXIO; return -ENXIO;
timer->phys_base = mem_rsrc.start;
size = mem_rsrc.end - mem_rsrc.start;
/* Static mapping, never released */ /* Static mapping, never released */
timer->io_base = ioremap(timer->phys_base, size); timer->io_base = ioremap(mem.start, mem.end - mem.start);
} }
if (!timer->io_base) if (!timer->io_base)

1
arch/arm/plat-omap/include/plat/dmtimer.h
View file

@ -261,7 +261,6 @@ int omap_dm_timers_active(void);
(_OMAP_TIMER_TICK_INT_MASK_COUNT_OFFSET | (WP_TOWR << WPSHIFT)) (_OMAP_TIMER_TICK_INT_MASK_COUNT_OFFSET | (WP_TOWR << WPSHIFT))
struct omap_dm_timer { struct omap_dm_timer {
unsigned long phys_base;
int id; int id;
int irq; int irq;
struct clk *fclk; struct clk *fclk;