adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

rtc: rtc-starfire fixes

Browse source 
Changes:

- remove locks, rtc class provides them
- remove unused include
- if the rtc can't handle set_time, the driver should not fake it

Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alessandro Zummo 2008-11-21 01:24:38 -08:00 committed by David S. Miller
parent cecf61bdee
commit be1ffce352
1 changed files with 14 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
drivers/rtc/rtc-starfire.c
View file

@ -6,7 +6,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/time.h>
#include <linux/rtc.h> #include <linux/rtc.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
@ -16,11 +15,6 @@ MODULE_AUTHOR("David S. Miller <davem@davemloft.net>");
MODULE_DESCRIPTION("Starfire RTC driver"); MODULE_DESCRIPTION("Starfire RTC driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
struct starfire_rtc {
struct rtc_device *rtc;
spinlock_t lock;
};
static u32 starfire_get_time(void) static u32 starfire_get_time(void)
{ {
static char obp_gettod[32]; static char obp_gettod[32];
@ -35,64 +29,31 @@ static u32 starfire_get_time(void)
static int starfire_read_time(struct device *dev, struct rtc_time *tm) static int starfire_read_time(struct device *dev, struct rtc_time *tm)
{ {
struct starfire_rtc *p = dev_get_drvdata(dev); rtc_time_to_tm(starfire_get_time(), tm);
unsigned long flags, secs; return rtc_valid_tm(tm);
spin_lock_irqsave(&p->lock, flags);
secs = starfire_get_time();
spin_unlock_irqrestore(&p->lock, flags);
rtc_time_to_tm(secs, tm);
return 0;
}
static int starfire_set_time(struct device *dev, struct rtc_time *tm)
{
unsigned long secs;
int err;
err = rtc_tm_to_time(tm, &secs);
if (err)
return err;
/* Do nothing, time is set using the service processor
* console on this platform.
*/
return 0;
} }
static const struct rtc_class_ops starfire_rtc_ops = { static const struct rtc_class_ops starfire_rtc_ops = {
.read_time = starfire_read_time, .read_time = starfire_read_time,
.set_time = starfire_set_time,
}; };
static int __devinit starfire_rtc_probe(struct platform_device *pdev) static int __init starfire_rtc_probe(struct platform_device *pdev)
{ {
struct starfire_rtc *p = kzalloc(sizeof(*p), GFP_KERNEL); struct rtc_device *rtc = rtc_device_register("starfire", &pdev->dev,
if (!p)
return -ENOMEM;
spin_lock_init(&p->lock);
p->rtc = rtc_device_register("starfire", &pdev->dev,
&starfire_rtc_ops, THIS_MODULE); &starfire_rtc_ops, THIS_MODULE);
if (IS_ERR(p->rtc)) { if (IS_ERR(rtc))
int err = PTR_ERR(p->rtc); return PTR_ERR(rtc);
kfree(p);
return err; platform_set_drvdata(pdev, rtc);
}
platform_set_drvdata(pdev, p);
return 0; return 0;
} }
static int __devexit starfire_rtc_remove(struct platform_device *pdev) static int __exit starfire_rtc_remove(struct platform_device *pdev)
{ {
struct starfire_rtc *p = platform_get_drvdata(pdev); struct rtc_device *rtc = platform_get_drvdata(pdev);
rtc_device_unregister(p->rtc); rtc_device_unregister(rtc);
kfree(p);
return 0; return 0;
} }
@ -102,13 +63,12 @@ static struct platform_driver starfire_rtc_driver = {
.name = "rtc-starfire", .name = "rtc-starfire",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = starfire_rtc_probe, .remove = __exit_p(starfire_rtc_remove),
.remove = __devexit_p(starfire_rtc_remove),
}; };
static int __init starfire_rtc_init(void) static int __init starfire_rtc_init(void)
{ {
return platform_driver_register(&starfire_rtc_driver); return platform_driver_probe(&starfire_rtc_driver, starfire_rtc_probe);
} }
static void __exit starfire_rtc_exit(void) static void __exit starfire_rtc_exit(void)