diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 10:55:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-01 10:55:14 -0500 |
commit | 33b07db9f38fe73b3895f8d4db8fdee03e3afec3 (patch) | |
tree | 69bb1d5519d0b1e5aa3cf59ad430b143aad71171 /drivers/sbus/char | |
parent | d9d060a98ff89fe0f86e24c9c0c3d2f0c566781c (diff) |
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>
Diffstat (limited to 'drivers/sbus/char')
-rw-r--r-- | drivers/sbus/char/bbc_i2c.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c index 054f5dd58931..f08e169ba1b5 100644 --- a/drivers/sbus/char/bbc_i2c.c +++ b/drivers/sbus/char/bbc_i2c.c | |||
@@ -361,7 +361,7 @@ fail: | |||
361 | extern int bbc_envctrl_init(struct bbc_i2c_bus *bp); | 361 | extern int bbc_envctrl_init(struct bbc_i2c_bus *bp); |
362 | extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp); | 362 | extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp); |
363 | 363 | ||
364 | static int __init bbc_i2c_probe(struct of_device *op, | 364 | static int __devinit bbc_i2c_probe(struct of_device *op, |
365 | const struct of_device_id *match) | 365 | const struct of_device_id *match) |
366 | { | 366 | { |
367 | struct bbc_i2c_bus *bp; | 367 | struct bbc_i2c_bus *bp; |
@@ -386,7 +386,7 @@ static int __init bbc_i2c_probe(struct of_device *op, | |||
386 | return err; | 386 | return err; |
387 | } | 387 | } |
388 | 388 | ||
389 | static int __exit bbc_i2c_remove(struct of_device *op) | 389 | static int __devexit bbc_i2c_remove(struct of_device *op) |
390 | { | 390 | { |
391 | struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev); | 391 | struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev); |
392 | 392 | ||
@@ -417,7 +417,7 @@ static struct of_platform_driver bbc_i2c_driver = { | |||
417 | .name = "bbc_i2c", | 417 | .name = "bbc_i2c", |
418 | .match_table = bbc_i2c_match, | 418 | .match_table = bbc_i2c_match, |
419 | .probe = bbc_i2c_probe, | 419 | .probe = bbc_i2c_probe, |
420 | .remove = __exit_p(bbc_i2c_remove), | 420 | .remove = __devexit_p(bbc_i2c_remove), |
421 | }; | 421 | }; |
422 | 422 | ||
423 | static int __init bbc_i2c_init(void) | 423 | static int __init bbc_i2c_init(void) |