Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Al Viro and committed by
Linus Torvalds
28a68159 ef0299bf

+3 -4
+3 -4
arch/ppc/platforms/pmac_time.c
··· 165 165 via_calibrate_decr(void) 166 166 { 167 167 struct device_node *vias; 168 - volatile unsigned char *via; 168 + volatile unsigned char __iomem *via; 169 169 int count = VIA_TIMER_FREQ_6 / 100; 170 170 unsigned int dstart, dend; 171 171 ··· 176 176 vias = find_devices("via"); 177 177 if (vias == 0 || vias->n_addrs == 0) 178 178 return 0; 179 - via = (volatile unsigned char *) 180 - ioremap(vias->addrs[0].address, vias->addrs[0].size); 179 + via = ioremap(vias->addrs[0].address, vias->addrs[0].size); 181 180 182 181 /* set timer 1 for continuous interrupts */ 183 182 out_8(&via[ACR], (via[ACR] & ~T1MODE) | T1MODE_CONT); ··· 201 202 printk(KERN_INFO "via_calibrate_decr: ticks per jiffy = %u (%u ticks)\n", 202 203 tb_ticks_per_jiffy, dstart - dend); 203 204 204 - iounmap((void*)via); 205 + iounmap(via); 205 206 206 207 return 1; 207 208 }