aboutsummaryrefslogtreecommitdiff
path: root/arch/ppc
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-04-24 14:58:08 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-24 14:58:08 -0700
commit28a6815979b4eff29956549d62f72582a81f041e (patch)
treeb628befcb8f61d0c5b4dcff468d1048997866064 /arch/ppc
parentef0299bf8e868c09bff13e6f3c4fc9b835f60471 (diff)
[PATCH] ppc trivial iomem annotations: pmac_time.c
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/platforms/pmac_time.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/ppc/platforms/pmac_time.c b/arch/ppc/platforms/pmac_time.c
index 09636546f44..de60ccc7db9 100644
--- a/arch/ppc/platforms/pmac_time.c
+++ b/arch/ppc/platforms/pmac_time.c
@@ -165,7 +165,7 @@ int __init
via_calibrate_decr(void)
{
struct device_node *vias;
- volatile unsigned char *via;
+ volatile unsigned char __iomem *via;
int count = VIA_TIMER_FREQ_6 / 100;
unsigned int dstart, dend;
@@ -176,8 +176,7 @@ via_calibrate_decr(void)
vias = find_devices("via");
if (vias == 0 || vias->n_addrs == 0)
return 0;
- via = (volatile unsigned char *)
- ioremap(vias->addrs[0].address, vias->addrs[0].size);
+ via = ioremap(vias->addrs[0].address, vias->addrs[0].size);
/* set timer 1 for continuous interrupts */
out_8(&via[ACR], (via[ACR] & ~T1MODE) | T1MODE_CONT);
@@ -202,7 +201,7 @@ via_calibrate_decr(void)
printk(KERN_INFO "via_calibrate_decr: ticks per jiffy = %u (%u ticks)\n",
tb_ticks_per_jiffy, dstart - dend);
- iounmap((void*)via);
+ iounmap(via);
return 1;
}