git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://github.com/davem330/sparc
[pandora-kernel.git]
/
drivers
/
rtc
/
rtc-ep93xx.c
diff --git
a/drivers/rtc/rtc-ep93xx.c
b/drivers/rtc/rtc-ep93xx.c
index
335551d
..
14a42a1
100644
(file)
--- a/
drivers/rtc/rtc-ep93xx.c
+++ b/
drivers/rtc/rtc-ep93xx.c
@@
-36,6
+36,7
@@
*/
struct ep93xx_rtc {
void __iomem *mmio_base;
*/
struct ep93xx_rtc {
void __iomem *mmio_base;
+ struct rtc_device *rtc;
};
static int ep93xx_rtc_get_swcomp(struct device *dev, unsigned short *preload,
};
static int ep93xx_rtc_get_swcomp(struct device *dev, unsigned short *preload,
@@
-130,7
+131,6
@@
static int __init ep93xx_rtc_probe(struct platform_device *pdev)
{
struct ep93xx_rtc *ep93xx_rtc;
struct resource *res;
{
struct ep93xx_rtc *ep93xx_rtc;
struct resource *res;
- struct rtc_device *rtc;
int err;
ep93xx_rtc = devm_kzalloc(&pdev->dev, sizeof(*ep93xx_rtc), GFP_KERNEL);
int err;
ep93xx_rtc = devm_kzalloc(&pdev->dev, sizeof(*ep93xx_rtc), GFP_KERNEL);
@@
-151,12
+151,12
@@
static int __init ep93xx_rtc_probe(struct platform_device *pdev)
return -ENXIO;
pdev->dev.platform_data = ep93xx_rtc;
return -ENXIO;
pdev->dev.platform_data = ep93xx_rtc;
- platform_set_drvdata(pdev, rtc);
+ platform_set_drvdata(pdev,
ep93xx_
rtc);
- rtc = rtc_device_register(pdev->name,
+
ep93xx_rtc->
rtc = rtc_device_register(pdev->name,
&pdev->dev, &ep93xx_rtc_ops, THIS_MODULE);
&pdev->dev, &ep93xx_rtc_ops, THIS_MODULE);
- if (IS_ERR(rtc)) {
- err = PTR_ERR(rtc);
+ if (IS_ERR(
ep93xx_rtc->
rtc)) {
+ err = PTR_ERR(
ep93xx_rtc->
rtc);
goto exit;
}
goto exit;
}
@@
-167,7
+167,7
@@
static int __init ep93xx_rtc_probe(struct platform_device *pdev)
return 0;
fail:
return 0;
fail:
- rtc_device_unregister(rtc);
+ rtc_device_unregister(
ep93xx_rtc->
rtc);
exit:
platform_set_drvdata(pdev, NULL);
pdev->dev.platform_data = NULL;
exit:
platform_set_drvdata(pdev, NULL);
pdev->dev.platform_data = NULL;
@@
-176,11
+176,11
@@
exit:
static int __exit ep93xx_rtc_remove(struct platform_device *pdev)
{
static int __exit ep93xx_rtc_remove(struct platform_device *pdev)
{
- struct
rtc_device *
rtc = platform_get_drvdata(pdev);
+ struct
ep93xx_rtc *ep93xx_
rtc = platform_get_drvdata(pdev);
sysfs_remove_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
platform_set_drvdata(pdev, NULL);
sysfs_remove_group(&pdev->dev.kobj, &ep93xx_rtc_sysfs_files);
platform_set_drvdata(pdev, NULL);
- rtc_device_unregister(rtc);
+ rtc_device_unregister(
ep93xx_rtc->
rtc);
pdev->dev.platform_data = NULL;
return 0;
pdev->dev.platform_data = NULL;
return 0;