[PATCH] ppc trivial iomem annotations: pmac_time.c

[PATCH] ppc trivial iomem annotations: pmac_time.c

[Al Viro]

Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
----
diff -urN RC12-rc3-sent/arch/ppc/platforms/pmac_time.c RC12-rc3-pmac_time/arch/ppc/platforms/pmac_time.c
--- RC12-rc3-sent/arch/ppc/platforms/pmac_time.c	Fri Sep 10 01:46:30 2004
+++ RC12-rc3-pmac_time/arch/ppc/platforms/pmac_time.c	Sun Apr 24 16:20:03 2005
@@ -165,7 +165,7 @@
 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 @@
 		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 @@
 	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;
 }