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

Revert "of_platform_driver noise on sparce"

This reverts commit e669dae6141ff97d3c7566207f5de3b487dcf837, since it
is incomplete, and clashes with fuller patches and the sparc 32/64
unification effort.

Requested-by: David Miller <davem@davemloft.net>
Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Linus Torvalds 33b07db9 d9d060a9

+12 -12
unified split
+1 -1
arch/sparc64/kernel/pci_fire.c
··· 455 return 0; 456 } 457 458 - static int __init fire_probe(struct of_device *op, 459 const struct of_device_id *match) 460 { 461 struct device_node *dp = op->node;
··· 455 return 0; 456 } 457 458 + static int __devinit fire_probe(struct of_device *op, 459 const struct of_device_id *match) 460 { 461 struct device_node *dp = op->node;
+2 -2
arch/sparc64/kernel/pci_psycho.c
··· 493 psycho_scan_bus(pbm, &op->dev); 494 } 495 496 - static struct pci_pbm_info * __init psycho_find_sibling(u32 upa_portid) 497 { 498 struct pci_pbm_info *pbm; 499 ··· 506 507 #define PSYCHO_CONFIGSPACE 0x001000000UL 508 509 - static int __init psycho_probe(struct of_device *op, 510 const struct of_device_id *match) 511 { 512 const struct linux_prom64_registers *pr_regs;
··· 493 psycho_scan_bus(pbm, &op->dev); 494 } 495 496 + static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid) 497 { 498 struct pci_pbm_info *pbm; 499 ··· 506 507 #define PSYCHO_CONFIGSPACE 0x001000000UL 508 509 + static int __devinit psycho_probe(struct of_device *op, 510 const struct of_device_id *match) 511 { 512 const struct linux_prom64_registers *pr_regs;
+1 -1
arch/sparc64/kernel/pci_sun4v.c
··· 929 return 0; 930 } 931 932 - static int __init pci_sun4v_probe(struct of_device *op, 933 const struct of_device_id *match) 934 { 935 const struct linux_prom64_registers *regs;
··· 929 return 0; 930 } 931 932 + static int __devinit pci_sun4v_probe(struct of_device *op, 933 const struct of_device_id *match) 934 { 935 const struct linux_prom64_registers *regs;
+3 -3
drivers/sbus/char/bbc_i2c.c
··· 361 extern int bbc_envctrl_init(struct bbc_i2c_bus *bp); 362 extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp); 363 364 - static int __init bbc_i2c_probe(struct of_device *op, 365 const struct of_device_id *match) 366 { 367 struct bbc_i2c_bus *bp; ··· 386 return err; 387 } 388 389 - static int __exit bbc_i2c_remove(struct of_device *op) 390 { 391 struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev); 392 ··· 417 .name = "bbc_i2c", 418 .match_table = bbc_i2c_match, 419 .probe = bbc_i2c_probe, 420 - .remove = __exit_p(bbc_i2c_remove), 421 }; 422 423 static int __init bbc_i2c_init(void)
··· 361 extern int bbc_envctrl_init(struct bbc_i2c_bus *bp); 362 extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp); 363 364 + static int __devinit bbc_i2c_probe(struct of_device *op, 365 const struct of_device_id *match) 366 { 367 struct bbc_i2c_bus *bp; ··· 386 return err; 387 } 388 389 + static int __devexit bbc_i2c_remove(struct of_device *op) 390 { 391 struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev); 392 ··· 417 .name = "bbc_i2c", 418 .match_table = bbc_i2c_match, 419 .probe = bbc_i2c_probe, 420 + .remove = __devexit_p(bbc_i2c_remove), 421 }; 422 423 static int __init bbc_i2c_init(void)
+5 -5
sound/sparc/cs4231.c
··· 1856 return 0; 1857 } 1858 1859 - static int __init cs4231_sbus_probe(struct of_device *op, const struct of_device_id *match) 1860 { 1861 struct resource *rp = &op->resource[0]; 1862 struct snd_card *card; ··· 2048 return 0; 2049 } 2050 2051 - static int __init cs4231_ebus_probe(struct of_device *op, const struct of_device_id *match) 2052 { 2053 struct snd_card *card; 2054 int err; ··· 2072 } 2073 #endif 2074 2075 - static int __init cs4231_probe(struct of_device *op, const struct of_device_id *match) 2076 { 2077 #ifdef EBUS_SUPPORT 2078 if (!strcmp(op->node->parent->name, "ebus")) ··· 2086 return -ENODEV; 2087 } 2088 2089 - static int __exit cs4231_remove(struct of_device *op) 2090 { 2091 struct snd_cs4231 *chip = dev_get_drvdata(&op->dev); 2092 ··· 2112 .name = "audio", 2113 .match_table = cs4231_match, 2114 .probe = cs4231_probe, 2115 - .remove = __exit_p(cs4231_remove), 2116 }; 2117 2118 static int __init cs4231_init(void)
··· 1856 return 0; 1857 } 1858 1859 + static int __devinit cs4231_sbus_probe(struct of_device *op, const struct of_device_id *match) 1860 { 1861 struct resource *rp = &op->resource[0]; 1862 struct snd_card *card; ··· 2048 return 0; 2049 } 2050 2051 + static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_device_id *match) 2052 { 2053 struct snd_card *card; 2054 int err; ··· 2072 } 2073 #endif 2074 2075 + static int __devinit cs4231_probe(struct of_device *op, const struct of_device_id *match) 2076 { 2077 #ifdef EBUS_SUPPORT 2078 if (!strcmp(op->node->parent->name, "ebus")) ··· 2086 return -ENODEV; 2087 } 2088 2089 + static int __devexit cs4231_remove(struct of_device *op) 2090 { 2091 struct snd_cs4231 *chip = dev_get_drvdata(&op->dev); 2092 ··· 2112 .name = "audio", 2113 .match_table = cs4231_match, 2114 .probe = cs4231_probe, 2115 + .remove = __devexit_p(cs4231_remove), 2116 }; 2117 2118 static int __init cs4231_init(void)