Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit e669dae6141ff97d3c7566207f5de3b487dcf837

Authored by Al Viro
Committed by Linus Torvalds
1 parent 30037818f7
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 5 changed files with 12 additions and 12 deletions Side-by-side Diff

arch/sparc64/kernel/pci_fire.c
Diff comments   View file @ e669dae
... ... @@ -455,7 +455,7 @@
455 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 459 const struct of_device_id *match)
460 460 {
461 461 struct device_node *dp = op->node;
arch/sparc64/kernel/pci_psycho.c
Diff comments   View file @ e669dae
... ... @@ -493,7 +493,7 @@
493 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 498 struct pci_pbm_info *pbm;
499 499  
... ... @@ -506,7 +506,7 @@
506 506  
507 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 510 const struct of_device_id *match)
511 511 {
512 512 const struct linux_prom64_registers *pr_regs;
arch/sparc64/kernel/pci_sun4v.c
Diff comments   View file @ e669dae
... ... @@ -929,7 +929,7 @@
929 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 933 const struct of_device_id *match)
934 934 {
935 935 const struct linux_prom64_registers *regs;
drivers/sbus/char/bbc_i2c.c
Diff comments   View file @ e669dae
... ... @@ -361,7 +361,7 @@
361 361 extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);
362 362 extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);
363 363  
364   -static int __devinit bbc_i2c_probe(struct of_device *op,
  364 +static int __init bbc_i2c_probe(struct of_device *op,
365 365 const struct of_device_id *match)
366 366 {
367 367 struct bbc_i2c_bus *bp;
... ... @@ -386,7 +386,7 @@
386 386 return err;
387 387 }
388 388  
389   -static int __devexit bbc_i2c_remove(struct of_device *op)
  389 +static int __exit bbc_i2c_remove(struct of_device *op)
390 390 {
391 391 struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev);
392 392  
... ... @@ -417,7 +417,7 @@
417 417 .name = "bbc_i2c",
418 418 .match_table = bbc_i2c_match,
419 419 .probe = bbc_i2c_probe,
420   - .remove = __devexit_p(bbc_i2c_remove),
  420 + .remove = __exit_p(bbc_i2c_remove),
421 421 };
422 422  
423 423 static int __init bbc_i2c_init(void)
sound/sparc/cs4231.c
Diff comments   View file @ e669dae
... ... @@ -1856,7 +1856,7 @@
1856 1856 return 0;
1857 1857 }
1858 1858  
1859   -static int __devinit cs4231_sbus_probe(struct of_device *op, const struct of_device_id *match)
  1859 +static int __init cs4231_sbus_probe(struct of_device *op, const struct of_device_id *match)
1860 1860 {
1861 1861 struct resource *rp = &op->resource[0];
1862 1862 struct snd_card *card;
... ... @@ -2048,7 +2048,7 @@
2048 2048 return 0;
2049 2049 }
2050 2050  
2051   -static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_device_id *match)
  2051 +static int __init cs4231_ebus_probe(struct of_device *op, const struct of_device_id *match)
2052 2052 {
2053 2053 struct snd_card *card;
2054 2054 int err;
... ... @@ -2072,7 +2072,7 @@
2072 2072 }
2073 2073 #endif
2074 2074  
2075   -static int __devinit cs4231_probe(struct of_device *op, const struct of_device_id *match)
  2075 +static int __init cs4231_probe(struct of_device *op, const struct of_device_id *match)
2076 2076 {
2077 2077 #ifdef EBUS_SUPPORT
2078 2078 if (!strcmp(op->node->parent->name, "ebus"))
... ... @@ -2086,7 +2086,7 @@
2086 2086 return -ENODEV;
2087 2087 }
2088 2088  
2089   -static int __devexit cs4231_remove(struct of_device *op)
  2089 +static int __exit cs4231_remove(struct of_device *op)
2090 2090 {
2091 2091 struct snd_cs4231 *chip = dev_get_drvdata(&op->dev);
2092 2092  
... ... @@ -2112,7 +2112,7 @@
2112 2112 .name = "audio",
2113 2113 .match_table = cs4231_match,
2114 2114 .probe = cs4231_probe,
2115   - .remove = __devexit_p(cs4231_remove),
  2115 + .remove = __exit_p(cs4231_remove),
2116 2116 };
2117 2117  
2118 2118 static int __init cs4231_init(void)