diff options
author | Al Viro <viro@parcelfarce.linux.theplanet.co.uk> | 2005-04-24 15:28:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-24 15:28:36 -0400 |
commit | ef0299bf8e868c09bff13e6f3c4fc9b835f60471 (patch) | |
tree | 0b734b9d95cf5fe38a9a15a48e4900d28447502e /arch/sparc64 | |
parent | fdca124a1bcc7e624f6b887c6f26153f40ee43ee (diff) |
[PATCH] mostek bogus sparse annotations fixed
void * __iomem foo is not a pointer to iomem - it's an iomem variable
containing void *. A pile of such guys in arch/sparc64/kernel/time.c,
drivers/sbus/char/rtc.c and include/asm-sparc64/mostek.h turned into
intended void __iomem *.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/time.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index c60785c046be..71b4e3807694 100644 --- a/arch/sparc64/kernel/time.c +++ b/arch/sparc64/kernel/time.c | |||
@@ -48,7 +48,7 @@ | |||
48 | 48 | ||
49 | DEFINE_SPINLOCK(mostek_lock); | 49 | DEFINE_SPINLOCK(mostek_lock); |
50 | DEFINE_SPINLOCK(rtc_lock); | 50 | DEFINE_SPINLOCK(rtc_lock); |
51 | void * __iomem mstk48t02_regs = 0UL; | 51 | void __iomem *mstk48t02_regs = NULL; |
52 | #ifdef CONFIG_PCI | 52 | #ifdef CONFIG_PCI |
53 | unsigned long ds1287_regs = 0UL; | 53 | unsigned long ds1287_regs = 0UL; |
54 | #endif | 54 | #endif |
@@ -59,8 +59,8 @@ u64 jiffies_64 = INITIAL_JIFFIES; | |||
59 | 59 | ||
60 | EXPORT_SYMBOL(jiffies_64); | 60 | EXPORT_SYMBOL(jiffies_64); |
61 | 61 | ||
62 | static void * __iomem mstk48t08_regs; | 62 | static void __iomem *mstk48t08_regs; |
63 | static void * __iomem mstk48t59_regs; | 63 | static void __iomem *mstk48t59_regs; |
64 | 64 | ||
65 | static int set_rtc_mmss(unsigned long); | 65 | static int set_rtc_mmss(unsigned long); |
66 | 66 | ||
@@ -520,7 +520,7 @@ void timer_tick_interrupt(struct pt_regs *regs) | |||
520 | /* Kick start a stopped clock (procedure from the Sun NVRAM/hostid FAQ). */ | 520 | /* Kick start a stopped clock (procedure from the Sun NVRAM/hostid FAQ). */ |
521 | static void __init kick_start_clock(void) | 521 | static void __init kick_start_clock(void) |
522 | { | 522 | { |
523 | void * __iomem regs = mstk48t02_regs; | 523 | void __iomem *regs = mstk48t02_regs; |
524 | u8 sec, tmp; | 524 | u8 sec, tmp; |
525 | int i, count; | 525 | int i, count; |
526 | 526 | ||
@@ -604,7 +604,7 @@ static void __init kick_start_clock(void) | |||
604 | /* Return nonzero if the clock chip battery is low. */ | 604 | /* Return nonzero if the clock chip battery is low. */ |
605 | static int __init has_low_battery(void) | 605 | static int __init has_low_battery(void) |
606 | { | 606 | { |
607 | void * __iomem regs = mstk48t02_regs; | 607 | void __iomem *regs = mstk48t02_regs; |
608 | u8 data1, data2; | 608 | u8 data1, data2; |
609 | 609 | ||
610 | spin_lock_irq(&mostek_lock); | 610 | spin_lock_irq(&mostek_lock); |
@@ -623,7 +623,7 @@ static int __init has_low_battery(void) | |||
623 | static void __init set_system_time(void) | 623 | static void __init set_system_time(void) |
624 | { | 624 | { |
625 | unsigned int year, mon, day, hour, min, sec; | 625 | unsigned int year, mon, day, hour, min, sec; |
626 | void * __iomem mregs = mstk48t02_regs; | 626 | void __iomem *mregs = mstk48t02_regs; |
627 | #ifdef CONFIG_PCI | 627 | #ifdef CONFIG_PCI |
628 | unsigned long dregs = ds1287_regs; | 628 | unsigned long dregs = ds1287_regs; |
629 | #else | 629 | #else |
@@ -843,7 +843,7 @@ void __init clock_probe(void) | |||
843 | !strcmp(model, "m5823")) { | 843 | !strcmp(model, "m5823")) { |
844 | ds1287_regs = edev->resource[0].start; | 844 | ds1287_regs = edev->resource[0].start; |
845 | } else { | 845 | } else { |
846 | mstk48t59_regs = (void * __iomem) | 846 | mstk48t59_regs = (void __iomem *) |
847 | edev->resource[0].start; | 847 | edev->resource[0].start; |
848 | mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02; | 848 | mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02; |
849 | } | 849 | } |
@@ -866,7 +866,7 @@ try_isa_clock: | |||
866 | !strcmp(model, "m5823")) { | 866 | !strcmp(model, "m5823")) { |
867 | ds1287_regs = isadev->resource.start; | 867 | ds1287_regs = isadev->resource.start; |
868 | } else { | 868 | } else { |
869 | mstk48t59_regs = (void * __iomem) | 869 | mstk48t59_regs = (void __iomem *) |
870 | isadev->resource.start; | 870 | isadev->resource.start; |
871 | mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02; | 871 | mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02; |
872 | } | 872 | } |
@@ -895,16 +895,16 @@ try_isa_clock: | |||
895 | } | 895 | } |
896 | 896 | ||
897 | if(model[5] == '0' && model[6] == '2') { | 897 | if(model[5] == '0' && model[6] == '2') { |
898 | mstk48t02_regs = (void * __iomem) | 898 | mstk48t02_regs = (void __iomem *) |
899 | (((u64)clk_reg[0].phys_addr) | | 899 | (((u64)clk_reg[0].phys_addr) | |
900 | (((u64)clk_reg[0].which_io)<<32UL)); | 900 | (((u64)clk_reg[0].which_io)<<32UL)); |
901 | } else if(model[5] == '0' && model[6] == '8') { | 901 | } else if(model[5] == '0' && model[6] == '8') { |
902 | mstk48t08_regs = (void * __iomem) | 902 | mstk48t08_regs = (void __iomem *) |
903 | (((u64)clk_reg[0].phys_addr) | | 903 | (((u64)clk_reg[0].phys_addr) | |
904 | (((u64)clk_reg[0].which_io)<<32UL)); | 904 | (((u64)clk_reg[0].which_io)<<32UL)); |
905 | mstk48t02_regs = mstk48t08_regs + MOSTEK_48T08_48T02; | 905 | mstk48t02_regs = mstk48t08_regs + MOSTEK_48T08_48T02; |
906 | } else { | 906 | } else { |
907 | mstk48t59_regs = (void * __iomem) | 907 | mstk48t59_regs = (void __iomem *) |
908 | (((u64)clk_reg[0].phys_addr) | | 908 | (((u64)clk_reg[0].phys_addr) | |
909 | (((u64)clk_reg[0].which_io)<<32UL)); | 909 | (((u64)clk_reg[0].which_io)<<32UL)); |
910 | mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02; | 910 | mstk48t02_regs = mstk48t59_regs + MOSTEK_48T59_48T02; |
@@ -1092,7 +1092,7 @@ unsigned long long sched_clock(void) | |||
1092 | static int set_rtc_mmss(unsigned long nowtime) | 1092 | static int set_rtc_mmss(unsigned long nowtime) |
1093 | { | 1093 | { |
1094 | int real_seconds, real_minutes, chip_minutes; | 1094 | int real_seconds, real_minutes, chip_minutes; |
1095 | void * __iomem mregs = mstk48t02_regs; | 1095 | void __iomem *mregs = mstk48t02_regs; |
1096 | #ifdef CONFIG_PCI | 1096 | #ifdef CONFIG_PCI |
1097 | unsigned long dregs = ds1287_regs; | 1097 | unsigned long dregs = ds1287_regs; |
1098 | #else | 1098 | #else |