diff options
author | Helge Deller <deller@gmx.de> | 2006-10-14 14:02:15 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@ubuntu.com> | 2006-12-08 00:34:38 -0500 |
commit | 3ee8f5e2cdd83b869f1b55e08eb26a87889b62f9 (patch) | |
tree | bcd9dfa1b47a8503271e555e39040c267bcd45b4 /arch/parisc/kernel | |
parent | 353dfe1290bdce1d40609e35ca6e42829623ff5f (diff) |
[PARISC] avoid compiler warnings when compiling 64bit
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r-- | arch/parisc/kernel/drivers.c | 8 | ||||
-rw-r--r-- | arch/parisc/kernel/pci.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index d6c486e9501c..6274cd268e6a 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c | |||
@@ -689,7 +689,9 @@ parse_tree_node(struct device *parent, int index, struct hardware_path *modpath) | |||
689 | .fn = check_parent, | 689 | .fn = check_parent, |
690 | }; | 690 | }; |
691 | 691 | ||
692 | device_for_each_child(parent, &recurse_data, descend_children); | 692 | if (device_for_each_child(parent, &recurse_data, descend_children)) |
693 | /* nothing */; | ||
694 | |||
693 | return d.dev; | 695 | return d.dev; |
694 | } | 696 | } |
695 | 697 | ||
@@ -835,8 +837,8 @@ static void print_parisc_device(struct parisc_device *dev) | |||
835 | static int count; | 837 | static int count; |
836 | 838 | ||
837 | print_pa_hwpath(dev, hw_path); | 839 | print_pa_hwpath(dev, hw_path); |
838 | printk(KERN_INFO "%d. %s at 0x%lx [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }", | 840 | printk(KERN_INFO "%d. %s at 0x%p [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }", |
839 | ++count, dev->name, dev->hpa.start, hw_path, dev->id.hw_type, | 841 | ++count, dev->name, (void*) dev->hpa.start, hw_path, dev->id.hw_type, |
840 | dev->id.hversion_rev, dev->id.hversion, dev->id.sversion); | 842 | dev->id.hversion_rev, dev->id.hversion, dev->id.sversion); |
841 | 843 | ||
842 | if (dev->num_addrs) { | 844 | if (dev->num_addrs) { |
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c index 199887a61c76..563df0072dee 100644 --- a/arch/parisc/kernel/pci.c +++ b/arch/parisc/kernel/pci.c | |||
@@ -200,8 +200,8 @@ static void | |||
200 | pcibios_link_hba_resources( struct resource *hba_res, struct resource *r) | 200 | pcibios_link_hba_resources( struct resource *hba_res, struct resource *r) |
201 | { | 201 | { |
202 | if (!r->parent) { | 202 | if (!r->parent) { |
203 | printk(KERN_EMERG "PCI: resource not parented! [%lx-%lx]\n", | 203 | printk(KERN_EMERG "PCI: resource not parented! [%p-%p]\n", |
204 | r->start, r->end); | 204 | (void*) r->start, (void*) r->end); |
205 | r->parent = hba_res; | 205 | r->parent = hba_res; |
206 | 206 | ||
207 | /* reverse link is harder *sigh* */ | 207 | /* reverse link is harder *sigh* */ |