diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2008-11-22 12:35:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 13:03:36 -0500 |
commit | e669dae6141ff97d3c7566207f5de3b487dcf837 (patch) | |
tree | d7c8b02ab791b42f3f493840279fcdaafcb9c515 /arch/sparc64 | |
parent | 30037818f7c1e11cb3742fbecd614ef3dc7b27bb (diff) |
of_platform_driver noise on sparce
switch to __init for those; unlike powerpc sparc has no hotplug support
for that stuff and their ->probe() tends to call __init functions while
being declared __devinit.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/pci_fire.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/pci_psycho.c | 4 | ||||
-rw-r--r-- | arch/sparc64/kernel/pci_sun4v.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc64/kernel/pci_fire.c b/arch/sparc64/kernel/pci_fire.c index 9462b68f4894..fcbbac66e141 100644 --- a/arch/sparc64/kernel/pci_fire.c +++ b/arch/sparc64/kernel/pci_fire.c | |||
@@ -455,7 +455,7 @@ static int __init pci_fire_pbm_init(struct pci_pbm_info *pbm, | |||
455 | return 0; | 455 | return 0; |
456 | } | 456 | } |
457 | 457 | ||
458 | static int __devinit fire_probe(struct of_device *op, | 458 | static int __init fire_probe(struct of_device *op, |
459 | const struct of_device_id *match) | 459 | const struct of_device_id *match) |
460 | { | 460 | { |
461 | struct device_node *dp = op->node; | 461 | struct device_node *dp = op->node; |
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index dfb3ec892987..56605adbb5b3 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c | |||
@@ -493,7 +493,7 @@ static void __init psycho_pbm_init(struct pci_pbm_info *pbm, | |||
493 | psycho_scan_bus(pbm, &op->dev); | 493 | psycho_scan_bus(pbm, &op->dev); |
494 | } | 494 | } |
495 | 495 | ||
496 | static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid) | 496 | static struct pci_pbm_info * __init psycho_find_sibling(u32 upa_portid) |
497 | { | 497 | { |
498 | struct pci_pbm_info *pbm; | 498 | struct pci_pbm_info *pbm; |
499 | 499 | ||
@@ -506,7 +506,7 @@ static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid) | |||
506 | 506 | ||
507 | #define PSYCHO_CONFIGSPACE 0x001000000UL | 507 | #define PSYCHO_CONFIGSPACE 0x001000000UL |
508 | 508 | ||
509 | static int __devinit psycho_probe(struct of_device *op, | 509 | static int __init psycho_probe(struct of_device *op, |
510 | const struct of_device_id *match) | 510 | const struct of_device_id *match) |
511 | { | 511 | { |
512 | const struct linux_prom64_registers *pr_regs; | 512 | const struct linux_prom64_registers *pr_regs; |
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c index 34a1fded3941..4b27b0e10ce7 100644 --- a/arch/sparc64/kernel/pci_sun4v.c +++ b/arch/sparc64/kernel/pci_sun4v.c | |||
@@ -929,7 +929,7 @@ static int __init pci_sun4v_pbm_init(struct pci_pbm_info *pbm, | |||
929 | return 0; | 929 | return 0; |
930 | } | 930 | } |
931 | 931 | ||
932 | static int __devinit pci_sun4v_probe(struct of_device *op, | 932 | static int __init pci_sun4v_probe(struct of_device *op, |
933 | const struct of_device_id *match) | 933 | const struct of_device_id *match) |
934 | { | 934 | { |
935 | const struct linux_prom64_registers *regs; | 935 | const struct linux_prom64_registers *regs; |