Skip to content

Commit

Permalink
rackmeter section fixes
Browse files Browse the repository at this point in the history
* rackmeter_remove() reference needs devexit_p
 * rackmeter_setup() is calls devinit and is called only from devinit

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Nov 30, 2008
1 parent ced7172 commit 31421a6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/macintosh/rack-meter.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ static void __devexit rackmeter_stop_cpu_sniffer(struct rackmeter *rm)
cancel_rearming_delayed_work(&rm->cpu[1].sniffer);
}

static int rackmeter_setup(struct rackmeter *rm)
static int __devinit rackmeter_setup(struct rackmeter *rm)
{
pr_debug("rackmeter: setting up i2s..\n");
rackmeter_setup_i2s(rm);
Expand Down Expand Up @@ -582,12 +582,12 @@ static struct of_device_id rackmeter_match[] = {
{ }
};

static struct macio_driver rackmeter_drv = {
static struct macio_driver rackmeter_driver = {
.name = "rackmeter",
.owner = THIS_MODULE,
.match_table = rackmeter_match,
.probe = rackmeter_probe,
.remove = rackmeter_remove,
.remove = __devexit_p(rackmeter_remove),
.shutdown = rackmeter_shutdown,
};

Expand All @@ -596,14 +596,14 @@ static int __init rackmeter_init(void)
{
pr_debug("rackmeter_init()\n");

return macio_register_driver(&rackmeter_drv);
return macio_register_driver(&rackmeter_driver);
}

static void __exit rackmeter_exit(void)
{
pr_debug("rackmeter_exit()\n");

macio_unregister_driver(&rackmeter_drv);
macio_unregister_driver(&rackmeter_driver);
}

module_init(rackmeter_init);
Expand Down

0 comments on commit 31421a6

Please sign in to comment.