aboutsummaryrefslogtreecommitdiff
path: root/drivers/rtc
diff options
context:
space:
mode:
authordann frazier <dannf@hp.com>2009-03-31 15:24:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-01 08:59:25 -0700
commit2b93cff4dc184bf7b4858dc7a9bd2e8d33c1a3eb (patch)
tree4a07200a2a3e3b4f9b6adaab121e05f73bc71aef /drivers/rtc
parentf62bacd4d48a1a6b8931a0140fb2324a06dd89fe (diff)
rtc-parisc: use platform_driver_probe
This isn't a hotpluggable device, so call platform_driver_probe directly in parisc_rtc_init Signed-off-by: dann frazier <dannf@hp.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Kyle McMartin <kyle@mcmartin.ca> Cc: Grant Grundler <grundler@parisc-linux.org> Cc: Matthew Wilcox <matthew@wil.cx> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-parisc.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/rtc/rtc-parisc.c b/drivers/rtc/rtc-parisc.c
index 0477cc129c6..a2ca07ad42c 100644
--- a/drivers/rtc/rtc-parisc.c
+++ b/drivers/rtc/rtc-parisc.c
@@ -40,19 +40,14 @@ static const struct rtc_class_ops parisc_rtc_ops = {
.set_time = parisc_set_time,
};
-static int __devinit parisc_rtc_probe(struct platform_device *dev)
+static int __init parisc_rtc_probe(struct platform_device *dev)
{
struct rtc_device *p;
- p = kzalloc(sizeof (*p), GFP_KERNEL);
- if (!p)
- return -ENOMEM;
-
p = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops,
THIS_MODULE);
if (IS_ERR(p)) {
int err = PTR_ERR(p);
- kfree(p);
return err;
}
@@ -61,12 +56,11 @@ static int __devinit parisc_rtc_probe(struct platform_device *dev)
return 0;
}
-static int __devexit parisc_rtc_remove(struct platform_device *dev)
+static int __exit parisc_rtc_remove(struct platform_device *dev)
{
struct rtc_device *p = platform_get_drvdata(dev);
rtc_device_unregister(p);
- kfree(p);
return 0;
}
@@ -82,7 +76,7 @@ static struct platform_driver parisc_rtc_driver = {
static int __init parisc_rtc_init(void)
{
- return platform_driver_register(&parisc_rtc_driver);
+ return platform_driver_probe(&parisc_rtc_driver, parisc_rtc_probe);
}
static void __exit parisc_rtc_fini(void)