Commit 6b318f66 authored by dann frazier's avatar dann frazier Committed by Linus Torvalds

rtc-parisc: remove struct parisc_rtc

parisc_rtc now only includes an rtc_device pointer, so let's
just use the rtc_device type directly.
Signed-off-by: default avatardann 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 05439f1f
...@@ -11,11 +11,6 @@ ...@@ -11,11 +11,6 @@
#include <asm/rtc.h> #include <asm/rtc.h>
/* as simple as can be, and no simpler. */
struct parisc_rtc {
struct rtc_device *rtc;
};
static int parisc_get_time(struct device *dev, struct rtc_time *tm) static int parisc_get_time(struct device *dev, struct rtc_time *tm)
{ {
unsigned long ret; unsigned long ret;
...@@ -47,16 +42,16 @@ static const struct rtc_class_ops parisc_rtc_ops = { ...@@ -47,16 +42,16 @@ static const struct rtc_class_ops parisc_rtc_ops = {
static int __devinit parisc_rtc_probe(struct platform_device *dev) static int __devinit parisc_rtc_probe(struct platform_device *dev)
{ {
struct parisc_rtc *p; struct rtc_device *p;
p = kzalloc(sizeof (*p), GFP_KERNEL); p = kzalloc(sizeof (*p), GFP_KERNEL);
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
p->rtc = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops, p = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops,
THIS_MODULE); THIS_MODULE);
if (IS_ERR(p->rtc)) { if (IS_ERR(p)) {
int err = PTR_ERR(p->rtc); int err = PTR_ERR(p);
kfree(p); kfree(p);
return err; return err;
} }
...@@ -68,9 +63,9 @@ static int __devinit parisc_rtc_probe(struct platform_device *dev) ...@@ -68,9 +63,9 @@ static int __devinit parisc_rtc_probe(struct platform_device *dev)
static int __devexit parisc_rtc_remove(struct platform_device *dev) static int __devexit parisc_rtc_remove(struct platform_device *dev)
{ {
struct parisc_rtc *p = platform_get_drvdata(dev); struct rtc_device *p = platform_get_drvdata(dev);
rtc_device_unregister(p->rtc); rtc_device_unregister(p);
kfree(p); kfree(p);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment