OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: 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>
This commit is contained in:
dann frazier 2009-03-31 15:24:51 -07:00 committed by Linus Torvalds
parent 05439f1f89
commit 6b318f66dc
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/rtc/rtc-parisc.c
View File

@ -11,11 +11,6 @@
#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)
{
unsigned long ret;
@ -47,16 +42,16 @@ static const struct rtc_class_ops parisc_rtc_ops = {
static int __devinit parisc_rtc_probe(struct platform_device *dev)
{
struct parisc_rtc *p;
struct rtc_device *p;
p = kzalloc(sizeof (*p), GFP_KERNEL);
if (!p)
return -ENOMEM;
p->rtc = rtc_device_register("rtc-parisc", &dev->dev, &parisc_rtc_ops,
THIS_MODULE);
if (IS_ERR(p->rtc)) {
int err = PTR_ERR(p->rtc);
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;
}
@ -68,9 +63,9 @@ static int __devinit parisc_rtc_probe(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);
return 0;